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

Sat Mar 16 21:08:52 CET 2013

http://hg.python.org/cpython/rev/533a60251b9d
changeset: 82695:533a60251b9d
parent: 82687:46cadd3955d0
parent: 82694:4a749972bad6
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Mar 16 15:57:27 2013 -0400
summary:
 Merge with 3.3
files:
 Doc/library/functions.rst | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -886,8 +886,8 @@
 *buffering* is an optional integer used to set the buffering policy. Pass 0
 to switch buffering off (only allowed in binary mode), 1 to select line
 buffering (only usable in text mode), and an integer > 1 to indicate the size
- of a fixed-size chunk buffer. When no *buffering* argument is given, the
- default buffering policy works as follows:
+ in bytes of a fixed-size chunk buffer. When no *buffering* argument is
+ given, the default buffering policy works as follows:
 
 * Binary files are buffered in fixed-size chunks; the size of the buffer is
 chosen using a heuristic trying to determine the underlying device's "block
-- 
Repository URL: http://hg.python.org/cpython
