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

[terry.reedy]

http://hg.python.org/cpython/rev/c76c6fd48449
changeset:   82696:c76c6fd48449
branch:      2.7
parent:      82689:c70746a0291f
parent:      82692:f334a0009586
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat Mar 16 16:03:37 2013 -0400
summary:
  Merge heads.

files:
  Doc/library/functions.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -874,9 +874,9 @@
 
    The optional *buffering* argument specifies the file's desired buffer size: 0
    means unbuffered, 1 means line buffered, any other positive value means use a
-   buffer of (approximately) that size.  A negative *buffering* means to use the
-   system default, which is usually line buffered for tty devices and fully
-   buffered for other files.  If omitted, the system default is used. [#]_
+   buffer of (approximately) that size (in bytes).  A negative *buffering* means
+   to use the system default, which is usually line buffered for tty devices and
+   fully buffered for other files.  If omitted, the system default is used. [#]_
 
    Modes ``'r+'``, ``'w+'`` and ``'a+'`` open the file for updating (note that
    ``'w+'`` truncates the file).  Append ``'b'`` to the mode to open the file in

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