diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Makefile | 2 | ||||
| -rw-r--r-- | Doc/distutils/index.rst | 1 | ||||
| -rw-r--r-- | Doc/documenting/index.rst | 1 | ||||
| -rw-r--r-- | Doc/extending/index.rst | 1 | ||||
| -rw-r--r-- | Doc/library/index.rst | 1 | ||||
| -rw-r--r-- | Doc/library/os.rst | 10 | ||||
| -rw-r--r-- | Doc/library/string.rst | 1 | ||||
| -rw-r--r-- | Doc/library/webbrowser.rst | 4 | ||||
| -rw-r--r-- | Doc/reference/index.rst | 1 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 4 | ||||
| -rw-r--r-- | Doc/tutorial/index.rst | 1 | ||||
| -rw-r--r-- | Doc/using/index.rst | 1 |
12 files changed, 20 insertions, 8 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 0fc1124..317fcb0 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -31,7 +31,7 @@ help: checkout: @if [ ! -d tools/sphinx ]; then \ echo "Checking out Sphinx..."; \ - svn checkout $(SVNROOT)/doctools/trunk/sphinx tools/sphinx; \ + svn checkout $(SVNROOT)/external/Sphinx-0.6.1/sphinx tools/sphinx; \ fi @if [ ! -d tools/docutils ]; then \ echo "Checking out Docutils..."; \ diff --git a/Doc/distutils/index.rst b/Doc/distutils/index.rst index 6d82c84..ace8280 100644 --- a/Doc/distutils/index.rst +++ b/Doc/distutils/index.rst @@ -16,6 +16,7 @@ very little overhead for build/release/install mechanics. .. toctree:: :maxdepth: 2 + :numbered: introduction.rst setupscript.rst diff --git a/Doc/documenting/index.rst b/Doc/documenting/index.rst index 5ec9fb6..b64dc75 100644 --- a/Doc/documenting/index.rst +++ b/Doc/documenting/index.rst @@ -23,6 +23,7 @@ to write reStructuredText if you're not so inclined; plain text contributions are more than welcome as well. .. toctree:: + :numbered: intro.rst style.rst diff --git a/Doc/extending/index.rst b/Doc/extending/index.rst index 6e8cf79..92e6132 100644 --- a/Doc/extending/index.rst +++ b/Doc/extending/index.rst @@ -26,6 +26,7 @@ For a detailed description of the whole Python/C API, see the separate .. toctree:: :maxdepth: 2 + :numbered: extending.rst newtypes.rst diff --git a/Doc/library/index.rst b/Doc/library/index.rst index 236b6e7..aa582de 100644 --- a/Doc/library/index.rst +++ b/Doc/library/index.rst @@ -38,6 +38,7 @@ the `Python Package Index <http://pypi.python.org/pypi>`_. .. toctree:: :maxdepth: 2 + :numbered: intro.rst functions.rst diff --git a/Doc/library/os.rst b/Doc/library/os.rst index ef5beaa..fc62b0b 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -796,9 +796,10 @@ Files and Directories function will not follow symbolic links. Availability: Unix. -.. function:: link(src, dst) +.. function:: link(source, link_name) - Create a hard link pointing to *src* named *dst*. Availability: Unix. + Create a hard link pointing to *source* named *link_name*. Availability: + Unix. .. function:: listdir(path) @@ -1078,9 +1079,10 @@ Files and Directories :attr:`f_flag`, :attr:`f_namemax`. Availability: Unix. -.. function:: symlink(src, dst) +.. function:: symlink(source, link_name) - Create a symbolic link pointing to *src* named *dst*. Availability: Unix. + Create a symbolic link pointing to *source* named *link_name*. Availability: + Unix. .. function:: unlink(path) diff --git a/Doc/library/string.rst b/Doc/library/string.rst index 2e444ad..5867a5a 100644 --- a/Doc/library/string.rst +++ b/Doc/library/string.rst @@ -218,6 +218,7 @@ does an index lookup using :func:`__getitem__`. Some simple format string examples:: "First, thou shalt count to {0}" # References first positional argument + "Bring me a {}" # Implicitly references the first positional argument "My quest is {name}" # References keyword argument 'name' "Weight in tons {0.weight}" # 'weight' attribute of first positional arg "Units destroyed: {players[0]}" # First element of keyword argument 'players'. diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst index ed56741..c42283f 100644 --- a/Doc/library/webbrowser.rst +++ b/Doc/library/webbrowser.rst @@ -167,8 +167,8 @@ Here are some simple examples:: Browser Controller Objects -------------------------- -Browser controllers provide these methods which parallel two of the module-level -convenience functions: +Browser controllers provide these methods which parallel three of the +module-level convenience functions: .. method:: controller.open(url[, new[, autoraise=1]]) diff --git a/Doc/reference/index.rst b/Doc/reference/index.rst index dff745c..bd1a281 100644 --- a/Doc/reference/index.rst +++ b/Doc/reference/index.rst @@ -18,6 +18,7 @@ interfaces available to C/C++ programmers in detail. .. toctree:: :maxdepth: 2 + :numbered: introduction.rst lexical_analysis.rst diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index dc8a834..024a5fa 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -72,7 +72,9 @@ class PydocTopicsBuilder(Builder): def write(self, *ignored): writer = TextWriter(self) - for label in self.status_iterator(pydoc_topic_labels, 'building topics... '): + for label in self.status_iterator(pydoc_topic_labels, + 'building topics... ', + length=len(pydoc_topic_labels)): if label not in self.env.labels: self.warn('label %r not in documentation' % label) continue diff --git a/Doc/tutorial/index.rst b/Doc/tutorial/index.rst index dfc6ac0..8a1a8fb 100644 --- a/Doc/tutorial/index.rst +++ b/Doc/tutorial/index.rst @@ -44,6 +44,7 @@ various Python library modules described in the Python Library Reference. The :ref:`glossary` is also worth going through. .. toctree:: + :numbered: appetite.rst interpreter.rst diff --git a/Doc/using/index.rst b/Doc/using/index.rst index ac5fd3c..6ce5a00 100644 --- a/Doc/using/index.rst +++ b/Doc/using/index.rst @@ -11,6 +11,7 @@ interpreter and things that make working with Python easier. .. toctree:: + :numbered: cmdline.rst unix.rst |