Add a Makefile to the Doc trees.

Doc-26/Makefile

@@ -0,0 +1,55 @@
+#
+# Makefile for Python documentation
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+
+PYTHON  = python
+SVNROOT = http://svn.python.org/projects
+
+.PHONY: default checkout html web htmlhelp clean
+
+default:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html  to make standalone HTML files"
+	@echo "  web   to make file usable by Sphinx.web"
+	@echo "  htmlhelp to make HTML files and a HTML help project"
+
+checkout:
+	@if [ ! -d tools/sphinx ]; then \
+	  echo "Checking out Sphinx..."; \
+	  svn checkout $(SVNROOT)/doctools/trunk/sphinx tools/sphinx; \
+	  echo "Checking out Pygments..."; \
+	  svn checkout $(SVNROOT)/external/Pygments-0.8.1/pygments tools/pygments; \
+	else \
+	  echo "Sphinx already checked out, run \`make update' to update" \
+	       "the toolchain."; \
+	fi
+
+update:
+	svn update tools/sphinx
+	svn update tools/pygments
+
+html: checkout
+	mkdir -p build/html build/doctrees
+	$(PYTHON) tools/sphinx-build.py -bhtml -dbuild/doctrees . build/html
+	@echo
+	@echo "Build finished. The HTML pages are in build/html."
+
+web: checkout
+	mkdir -p build/web build/doctrees
+	$(PYTHON) tools/sphinx-build.py -bweb -dbuild/doctrees . build/web
+	@echo
+	@echo "Build finished; now you can run"
+	@echo "  PYTHONPATH=tools $(PYTHON) -m sphinx.web build/web"
+	@echo "to start the server."
+
+htmlhelp: checkout
+	mkdir -p build/hhp build/doctrees
+	$(PYTHON) tools/sphinx-build.py -bhtmlhelp -dbuild/doctrees . build/hhp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      "build/hhp/pydoc.hhp project file."
+
+clean:
+	-rm -rf build/*
+	-rm -rf tools/sphinx

Doc-26/tools/sphinx-build.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    Sphinx - Python documentation toolchain
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: 2007 by Georg Brandl.
+    :license: Python license.
+"""
+
+import sys
+
+if __name__ == '__main__':
+    from sphinx import main
+    sys.exit(main(sys.argv))

Doc-26/tools/sphinx-web.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    Sphinx - Python documentation webserver
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: 2007 by Georg Brandl.
+    :license: Python license.
+"""
+
+import sys
+
+if __name__ == '__main__':
+    from sphinx.web import main
+    sys.exit(main(sys.argv))

Doc-26/tutorial/modules.rst

@@ -510,10 +510,10 @@ package of which the current module is a submodule), the :keyword:`import`
 statement looks for a top-level module with the given name.
 
 When packages are structured into subpackages (as with the :mod:`sound` package
-in the example), there's no shortcut to refer to submodules of sibling packages
-- the full name of the subpackage must be used.  For example, if the module
-:mod:`sound.filters.vocoder` needs to use the :mod:`echo` module in the
-:mod:`sound.effects` package, it can use ``from sound.effects import echo``.
+in the example), you can use absolute imports to refer to submodules of siblings
+packages.  For example, if the module :mod:`sound.filters.vocoder` needs to use
+the :mod:`echo` module in the :mod:`sound.effects` package, it can use ``from
+sound.effects import echo``.
 
 Starting with Python 2.5, in addition to the implicit relative imports described
 above, you can write explicit relative imports with the ``from module import

Doc-3k/Makefile

@@ -0,0 +1,55 @@
+#
+# Makefile for Python documentation
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+
+PYTHON  = python
+SVNROOT = http://svn.python.org/projects
+
+.PHONY: default checkout html web htmlhelp clean
+
+default:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html  to make standalone HTML files"
+	@echo "  web   to make file usable by Sphinx.web"
+	@echo "  htmlhelp to make HTML files and a HTML help project"
+
+checkout:
+	@if [ ! -d tools/sphinx ]; then \
+	  echo "Checking out Sphinx..."; \
+	  svn checkout $(SVNROOT)/doctools/trunk/sphinx tools/sphinx; \
+	  echo "Checking out Pygments..."; \
+	  svn checkout $(SVNROOT)/external/Pygments-0.8.1/pygments tools/pygments; \
+	else \
+	  echo "Sphinx already checked out, run \`make update' to update" \
+	       "the toolchain."; \
+	fi
+
+update:
+	svn update tools/sphinx
+	svn update tools/pygments
+
+html: checkout
+	mkdir -p build/html build/doctrees
+	$(PYTHON) tools/sphinx-build.py -bhtml -dbuild/doctrees . build/html
+	@echo
+	@echo "Build finished. The HTML pages are in build/html."
+
+web: checkout
+	mkdir -p build/web build/doctrees
+	$(PYTHON) tools/sphinx-build.py -bweb -dbuild/doctrees . build/web
+	@echo
+	@echo "Build finished; now you can run"
+	@echo "  PYTHONPATH=tools $(PYTHON) -m sphinx.web build/web"
+	@echo "to start the server."
+
+htmlhelp: checkout
+	mkdir -p build/hhp build/doctrees
+	$(PYTHON) tools/sphinx-build.py -bhtmlhelp -dbuild/doctrees . build/hhp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      "build/hhp/pydoc.hhp project file."
+
+clean:
+	-rm -rf build/*
+	-rm -rf tools/sphinx

Doc-3k/tools/sphinx-build.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    Sphinx - Python documentation toolchain
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: 2007 by Georg Brandl.
+    :license: Python license.
+"""
+
+import sys
+
+if __name__ == '__main__':
+    from sphinx import main
+    sys.exit(main(sys.argv))

Doc-3k/tools/sphinx-web.py

@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+"""
+    Sphinx - Python documentation webserver
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: 2007 by Georg Brandl.
+    :license: Python license.
+"""
+
+import sys
+
+if __name__ == '__main__':
+    from sphinx.web import main
+    sys.exit(main(sys.argv))

Doc-3k/tutorial/modules.rst

@@ -510,10 +510,10 @@ package of which the current module is a submodule), the :keyword:`import`
 statement looks for a top-level module with the given name.
 
 When packages are structured into subpackages (as with the :mod:`sound` package
-in the example), there's no shortcut to refer to submodules of sibling packages
-- the full name of the subpackage must be used.  For example, if the module
-:mod:`sound.filters.vocoder` needs to use the :mod:`echo` module in the
-:mod:`sound.effects` package, it can use ``from sound.effects import echo``.
+in the example), you can use absolute imports to refer to submodules of siblings
+packages.  For example, if the module :mod:`sound.filters.vocoder` needs to use
+the :mod:`echo` module in the :mod:`sound.effects` package, it can use ``from
+sound.effects import echo``.
 
 Starting with Python 2.5, in addition to the implicit relative imports described
 above, you can write explicit relative imports with the ``from module import