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

[antoine.pitrou]

http://hg.python.org/cpython/rev/66f2bcb47050
changeset:   74346:66f2bcb47050
branch:      2.7
parent:      74345:60e77810a47e
parent:      74335:10a5165103f9
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Thu Jan 12 08:09:15 2012 +0100
summary:
  Merge

files:
  Doc/library/stdtypes.rst |  6 +++---
  Doc/tutorial/classes.rst |  4 ++--
  2 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1049,7 +1049,7 @@
 
    Return the string left justified in a string of length *width*. Padding is done
    using the specified *fillchar* (default is a space).  The original string is
-   returned if *width* is less than ``len(s)``.
+   returned if *width* is less than or equal to ``len(s)``.
 
    .. versionchanged:: 2.4
       Support for the *fillchar* argument.
@@ -1113,7 +1113,7 @@
 
    Return the string right justified in a string of length *width*. Padding is done
    using the specified *fillchar* (default is a space). The original string is
-   returned if *width* is less than ``len(s)``.
+   returned if *width* is less than or equal to ``len(s)``.
 
    .. versionchanged:: 2.4
       Support for the *fillchar* argument.
@@ -1293,7 +1293,7 @@
 
    Return the numeric string left filled with zeros in a string of length
    *width*.  A sign prefix is handled correctly.  The original string is
-   returned if *width* is less than ``len(s)``.
+   returned if *width* is less than or equal to ``len(s)``.
 
 
    .. versionadded:: 2.2.2
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -409,8 +409,8 @@
            self.add(x)
 
 Methods may reference global names in the same way as ordinary functions.  The
-global scope associated with a method is the module containing the class
-definition.  (The class itself is never used as a global scope.)  While one
+global scope associated with a method is the module containing its
+definition.  (A class is never used as a global scope.)  While one
 rarely encounters a good reason for using global data in a method, there are
 many legitimate uses of the global scope: for one thing, functions and modules
 imported into the global scope can be used by methods, as well as functions and

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