diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Makefile | 7 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 317fcb0438..c9f3ed69e3 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -28,6 +28,7 @@ help: @echo " coverage to check documentation coverage for library and C API" @echo " dist to create a \"dist\" directory with archived docs for download" +# Note: if you update versions here, do the same in make.bat and README.txt checkout: @if [ ! -d tools/sphinx ]; then \ echo "Checking out Sphinx..."; \ @@ -101,8 +102,8 @@ doctest: build pydoc-topics: BUILDER = pydoc-topics pydoc-topics: build - @echo "Building finished; now copy build/pydoc-topics/pydoc_topics.py " \ - "into the Lib/ directory" + @echo "Building finished; now copy build/pydoc-topics/topics.py " \ + "to Lib/pydoc_data/topics.py" htmlview: html $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')" @@ -132,7 +133,7 @@ dist: (cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-text.zip python-$(DISTVERSION)-docs-text) rm -r dist/python-$(DISTVERSION)-docs-text rm dist/python-$(DISTVERSION)-docs-text.tar - + # archive the A4 latex -rm -r build/latex make latex PAPER=a4 diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index 024a5fa2d9..2ed36b23a9 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -5,7 +5,7 @@ Sphinx extension with Python doc-specific markup. - :copyright: 2008 by Georg Brandl. + :copyright: 2008, 2009 by Georg Brandl. :license: Python license. """ @@ -87,7 +87,7 @@ class PydocTopicsBuilder(Builder): self.topics[label] = str(writer.output) def finish(self): - f = open(path.join(self.outdir, 'pydoc_topics.py'), 'w') + f = open(path.join(self.outdir, 'topics.py'), 'w') try: f.write('# Autogenerated by Sphinx on %s\n' % asctime()) f.write('topics = ' + pformat(self.topics) + '\n') |