Merge heads 3.3.

tungts1101 · Mar 16, 2013 · cf90543 · cf90543
2 parents e5e7a7c + f39cab1
commit cf90543
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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