summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 16:03:37 -0400
committerTerry Jan Reedy <tjreedy@udel.edu>2013-03-16 16:03:37 -0400
commite493e87f352033006edb5fb0b64158a77a870edb (patch)
treec9b5aa3b8115d1031a49e0db35f7ba704694cce8
parente015b6b1fc5a8ee42c8643ff98b4a1559fe1a551 (diff)
parent589cb111b583b041ee5419d35ce6fab6c5d44474 (diff)
downloadcpython-git-e493e87f352033006edb5fb0b64158a77a870edb.tar.gz
Merge heads.
-rw-r--r--Doc/library/functions.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index 6d50e0d880..08fb7fedcc 100644
--- 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