Merge heads.

e493e87f · Terry Jan Reedy · e015b6b1 · 589cb111 · e493e87f
Commit e493e87f authored Mar 16, 2013 by Terry Jan Reedy
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Doc/library/functions.rst Doc/library/functions.rst +3 -3

No files found.
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -874,9 +874,9 @@ available.  They are listed here in alphabetical order.

   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