summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 20:06:52 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 20:06:52 (GMT)
commitcf9054396dcd01d2ed87035aca33aab1354eaf07 (patch)
treefd05ab923300f74b775349fcf7c0fcf9de8f20b4
parente5e7a7cbf450f80fa9a88038878b6bd525313f37 (diff)
parentf39cab1076d2ec92f641e0428c18bbb527cf41b1 (diff)
downloadcpython-cf9054396dcd01d2ed87035aca33aab1354eaf07.zip
cpython-cf9054396dcd01d2ed87035aca33aab1354eaf07.tar.gz
cpython-cf9054396dcd01d2ed87035aca33aab1354eaf07.tar.bz2
Merge heads 3.3.
-rw-r--r--Doc/library/functions.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index f1e6dc2..91d0aaf 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -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