← Back to branch summary

~noskcaj/ubuntu/vivid/webtest/merge

« back to all changes in this revision

Viewing changes to docs/Makefile

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-05-26 07:06:41 UTC
  • mfrom: (16.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20140526070641-j1obqenfyewrcj4e
Tags: 2.0.15-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - d/control: Demote python-lxml and python-pyquery to Suggests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/Makefile
3
3
 
4
4
# You can set these variables from the command line.
5
5
SPHINXOPTS    =
6
 
SPHINXBUILD   = ../bin/sphinx-build
 
6
SPHINXBUILD   = sphinx-build
7
7
PAPER         =
8
8
BUILDDIR      = _build
9
9
 
145
145
        $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
146
146
        @echo
147
147
        @echo "Link check complete; look for any errors in the above output " \
148
 
              "or in $(BUILDDIR)/linkcheck/output.txt."
 
148
              "or in $(BUILDDIR)/linkcheck/output.rst."
149
149
 
150
150
doctest:
151
151
        $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
152
152
        @echo "Testing of doctests in the sources finished, look at the " \
153
 
              "results in $(BUILDDIR)/doctest/output.txt."
 
153
              "results in $(BUILDDIR)/doctest/output.rst."