summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-09-12 15:41:24 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-09-12 15:41:24 (GMT)
commit4c3124c2b94add8cc168ebe29aa47f0f7326d7d8 (patch)
tree82ab82bf0f007e85512a67edb677162e73eed3ee /Lib
parentfaabef548dab1979759a67f482a06cdc3a153197 (diff)
parent1d7deafeea8fad9c58480f646e7ac125105288c5 (diff)
downloadcpython-4c3124c2b94add8cc168ebe29aa47f0f7326d7d8.zip
cpython-4c3124c2b94add8cc168ebe29aa47f0f7326d7d8.tar.gz
cpython-4c3124c2b94add8cc168ebe29aa47f0f7326d7d8.tar.bz2
Merge 3.2
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/pydoc.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index f0b0200..211d3d7 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1041,10 +1041,11 @@ class TextDoc(Doc):
if docloc is not None:
result = result + self.section('MODULE REFERENCE', docloc + """
-The following documentation is automatically generated from the Python source
-files. It may be incomplete, incorrect or include features that are considered
-implementation detail and may vary between Python implementations. When in
-doubt, consult the module reference at the location listed above.
+The following documentation is automatically generated from the Python
+source files. It may be incomplete, incorrect or include features that
+are considered implementation detail and may vary between Python
+implementations. When in doubt, consult the module reference at the
+location listed above.
""")
if desc: