[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

[eric.araujo]

http://hg.python.org/cpython/rev/76edde9b63ae
changeset:   72360:76edde9b63ae
parent:      72359:ad6b879eab02
parent:      72358:882d3b78b1cc
user:        Éric Araujo <merwok at netwok.org>
date:        Mon Sep 12 17:41:24 2011 +0200
summary:
  Merge 3.2

files:
  Lib/pydoc.py |  9 +++++----
  1 files changed, 5 insertions(+), 4 deletions(-)


diff --git a/Lib/pydoc.py b/Lib/pydoc.py
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -1041,10 +1041,11 @@
         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:

-- 
Repository URL: http://hg.python.org/cpython