summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-18 19:49:19 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-18 19:49:19 (GMT)
commit92165e6af78968d6bad2f8a7d070aa06fea8b4dd (patch)
treedbcf1778159982fa85f6322a911cdf6ba3a48189
parent689aa6d3fa2ca375b6c9b9f9ef9a6b07322f9160 (diff)
downloadcpython-92165e6af78968d6bad2f8a7d070aa06fea8b4dd.zip
cpython-92165e6af78968d6bad2f8a7d070aa06fea8b4dd.tar.gz
cpython-92165e6af78968d6bad2f8a7d070aa06fea8b4dd.tar.bz2
Merged revisions 86528 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86528 | ezio.melotti | 2010-11-18 21:48:27 +0200 (Thu, 18 Nov 2010) | 1 line #10455: fix typo ........
-rw-r--r--Doc/library/urllib.request.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
index 1278434..ccd946b 100644
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1257,7 +1257,7 @@ The following example uses no proxies at all, overriding environment settings::
The :mod:`urllib.response` module defines functions and classes which define a
minimal file like interface, including ``read()`` and ``readline()``. The
-typical response object is an addinfourl instance, which defines and ``info()``
+typical response object is an addinfourl instance, which defines an ``info()``
method and that returns headers and a ``geturl()`` method that returns the url.
Functions defined by this module are used internally by the
:mod:`urllib.request` module.