Merge with 3.2

This commit is contained in:
Terry Jan Reedy 2013-03-16 15:56:50 -04:00
commit f39cab1076
1 changed files with 2 additions and 2 deletions

View File

@ -876,8 +876,8 @@ are always available. They are listed here in alphabetical order.
*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