merge heads
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 3cf5335..3ef01cc 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -959,7 +959,9 @@
*end*.
The *file* argument must be an object with a ``write(string)`` method; if it
- is not present or ``None``, :data:`sys.stdout` will be used.
+ is not present or ``None``, :data:`sys.stdout` will be used. Output buffering
+ is determined by *file*. Use ``sys.stdout.flush()`` to ensure immediate
+ appearance on a screen.
.. function:: property(fget=None, fset=None, fdel=None, doc=None)
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index bfeaab9..04fd57f 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1193,7 +1193,7 @@
Return a string which is the concatenation of the strings in the
:term:`iterable` *iterable*. A :exc:`TypeError` will be raised if there are
- any non-string values in *seq*, including :class:`bytes` objects. The
+ any non-string values in *iterable*, including :class:`bytes` objects. The
separator between elements is the string providing this method.
@@ -1201,7 +1201,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)``.
.. method:: str.lower()
@@ -1270,7 +1270,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)``.
.. method:: str.rpartition(sep)
@@ -1419,7 +1419,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)``.
diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 4926280..33171cd 100644
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -458,8 +458,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