#13510: clarify that f.readlines() is note necessary to iterate over a file. Patch by Dan Riti.
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index 8994086..cc6cc95 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -296,6 +296,9 @@
to control the number of lines read: no more lines will be read if the
total size (in bytes/characters) of all lines so far exceeds *hint*.
+ Note that it's already possible to iterate on file objects using ``for
+ line in file: ...`` without calling ``file.readlines()``.
+
.. method:: seek(offset, whence=SEEK_SET)
Change the stream position to the given byte *offset*. *offset* is
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
index 2f08110..b1611f2 100644
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -295,18 +295,8 @@
>>> f.readline()
''
-``f.readlines()`` returns a list containing all the lines of data in the file.
-If given an optional parameter *sizehint*, it reads that many bytes from the
-file and enough more to complete a line, and returns the lines from that. This
-is often used to allow efficient reading of a large file by lines, but without
-having to load the entire file in memory. Only complete lines will be returned.
-::
-
- >>> f.readlines()
- ['This is the first line of the file.\n', 'Second line of the file\n']
-
-An alternative approach to reading lines is to loop over the file object. This is
-memory efficient, fast, and leads to simpler code::
+For reading lines from a file, you can loop over the file object. This is memory
+efficient, fast, and leads to simple code::
>>> for line in f:
print line,
@@ -314,9 +304,8 @@
This is the first line of the file.
Second line of the file
-The alternative approach is simpler but does not provide as fine-grained
-control. Since the two approaches manage line buffering differently, they
-should not be mixed.
+If you want to read all the lines of a file in a list you can also use
+``list(f)`` or ``f.readlines()``.
``f.write(string)`` writes the contents of *string* to the file, returning
``None``. ::
diff --git a/Misc/ACKS b/Misc/ACKS
index 78f074c..e9ec9c8 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -838,6 +838,7 @@
Jean-Claude Rimbault
Vlad Riscutia
Wes Rishel
+Dan Riti
Juan M. Bello Rivas
Davide Rizzo
Anthony Roach