merge heads
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 704585b..54873ae 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -543,6 +543,9 @@
A debugging hook. If :attr:`debuglevel` is greater than zero, messages
will be printed to stdout as the response is read and parsed.
+.. attribute:: HTTPResponse.closed
+
+ Is True if the stream is closed.
Examples
--------
@@ -555,7 +558,15 @@
>>> r1 = conn.getresponse()
>>> print(r1.status, r1.reason)
200 OK
- >>> data1 = r1.read()
+ >>> data1 = r1.read() # This will return entire content.
+ >>> # The following example demonstrates reading data in chunks.
+ >>> conn.request("GET", "/index.html")
+ >>> r1 = conn.getresponse()
+ >>> while not r1.closed:
+ ... print(r1.read(200)) # 200 bytes
+ b'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
+ ...
+ >>> # Example of an invalid request
>>> conn.request("GET", "/parrot.spam")
>>> r2 = conn.getresponse()
>>> print(r2.status, r2.reason)
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index d4bfbda..2451fd5 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -159,13 +159,14 @@
.. index:: triple: module; search; path
-When a module named :mod:`spam` is imported, the interpreter searches for a file
-named :file:`spam.py` in the current directory, and then in the list of
-directories specified by the environment variable :envvar:`PYTHONPATH`. This
-has the same syntax as the shell variable :envvar:`PATH`, that is, a list of
-directory names. When :envvar:`PYTHONPATH` is not set, or when the file is not
-found there, the search continues in an installation-dependent default path; on
-Unix, this is usually :file:`.:/usr/local/lib/python`.
+When a module named :mod:`spam` is imported, the interpreter searches for a
+file named :file:`spam.py` in the directory containing the input script (or
+the current directory), and then in the list of directories specified by the
+environment variable :envvar:`PYTHONPATH`. This has the same syntax as the
+shell variable :envvar:`PATH`, that is, a list of directory names. When
+:envvar:`PYTHONPATH` is not set, or when the file is not found there, the
+search continues in an installation-dependent default path; on Unix, this is
+usually :file:`.:/usr/local/lib/python`.
Actually, modules are searched in the list of directories given by the variable
``sys.path`` which is initialized from the directory containing the input script