summaryrefslogtreecommitdiffstats
path: root/Doc/library/functions.rst
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 19:57:27 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 19:57:27 (GMT)
commit8b8df5a8fb9f660d8276cf64ed43439bba236829 (patch)
tree20cf53404c0384a6d300548c143069eea91492e7 /Doc/library/functions.rst
parent2d6acd2ac2399ecc0f163c12c5695f434ba14955 (diff)
parentf39cab1076d2ec92f641e0428c18bbb527cf41b1 (diff)
downloadcpython-8b8df5a8fb9f660d8276cf64ed43439bba236829.zip
cpython-8b8df5a8fb9f660d8276cf64ed43439bba236829.tar.gz
cpython-8b8df5a8fb9f660d8276cf64ed43439bba236829.tar.bz2
Merge with 3.3
Diffstat (limited to 'Doc/library/functions.rst')
-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 7648c73..ceb75d2 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -886,8 +886,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