[Python-checkins] cpython (merge 3.2 -> default): Merge 3.2

[florent.xicluna]

http://hg.python.org/cpython/rev/ae78a2250b4c
changeset:   73174:ae78a2250b4c
parent:      73172:a100cb756cb8
parent:      73173:efd28631b2a5
user:        Florent Xicluna <florent.xicluna at gmail.com>
date:        Fri Oct 28 22:16:23 2011 +0200
summary:
  Merge 3.2

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


diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -1291,8 +1291,8 @@
 * Currently, only the following protocols are supported: HTTP (versions 0.9 and
   1.0), FTP, and local files.
 
-* The caching feature of :func:`urlretrieve` has been disabled until someone find
-  the time to hack proper processing of Expiration time headers.
+* The caching feature of :func:`urlretrieve` has been disabled until someone
+  finds the time to hack proper processing of Expiration time headers.
 
 * There should be a function to query whether a particular URL is in the cache.
 

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