summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-11-18 01:58:16 (GMT)
committerAlexander Belopolsky <alexander.belopolsky@gmail.com>2010-11-18 01:58:16 (GMT)
commit4979b9b91ebfaefa53e44546097db7a5eab7e547 (patch)
tree141e0ec1e03d6f632b66a92a6dad7c67d7c62c8d /Doc
parent6083170858771dc8098be3c6651616419b76aeaa (diff)
downloadcpython-4979b9b91ebfaefa53e44546097db7a5eab7e547.zip
cpython-4979b9b91ebfaefa53e44546097db7a5eab7e547.tar.gz
cpython-4979b9b91ebfaefa53e44546097db7a5eab7e547.tar.bz2
Merged revisions 86504 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86504 | alexander.belopolsky | 2010-11-17 20:52:54 -0500 (Wed, 17 Nov 2010) | 15 lines Issue #10446: Several changes to module documentation generated by pydoc: 1. Online reference manual link is now version-specific and the 'MODULE DOCS' section renamed to 'MODULE REFERENCE'. 2. 'FILE' section is moved to the end of the file. 3. Special names processed by pydoc such as __version__ or __credits__ are now excluded from the DATA section. 4. Defined __all__ to prevent pydoc from exposing undocumented details about itself. 5. Removed Python 2.3 compatibility code. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/pydoc.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst
index 9abac6e..8ac2f34 100644
--- a/Doc/library/pydoc.rst
+++ b/Doc/library/pydoc.rst
@@ -64,7 +64,9 @@ documents precisely the version of the module you would get if you started the
Python interpreter and typed ``import spam``.
Module docs for core modules are assumed to reside in
-http://docs.python.org/library/. This can be overridden by setting the
-:envvar:`PYTHONDOCS` environment variable to a different URL or to a local
-directory containing the Library Reference Manual pages.
+``http://docs.python.org/X.Y/library/`` where ``X`` and ``Y`` are the
+major and minor version numbers of the Python interpreter. This can
+be overridden by setting the :envvar:`PYTHONDOCS` environment variable
+to a different URL or to a local directory containing the Library
+Reference Manual pages.