[Python-checkins] cpython (merge 3.4 -> default): Closes #22004: Merge with 3.4

[zach.ware]

http://hg.python.org/cpython/rev/f83adc06f486
changeset:   91727:f83adc06f486
parent:      91724:0e4e3ba73f3c
parent:      91726:252cd056d1cf
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Jul 18 09:14:55 2014 -0500
summary:
  Closes #22004: Merge with 3.4

files:
  Doc/library/io.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/io.rst b/Doc/library/io.rst
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -289,7 +289,7 @@
       most *size* bytes will be read.
 
       The line terminator is always ``b'\n'`` for binary files; for text files,
-      the *newlines* argument to :func:`open` can be used to select the line
+      the *newline* argument to :func:`open` can be used to select the line
       terminator(s) recognized.
 
    .. method:: readlines(hint=-1)

-- 
Repository URL: http://hg.python.org/cpython