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

[florent.xicluna]

http://hg.python.org/cpython/rev/a100cb756cb8
changeset:   73172:a100cb756cb8
parent:      73170:5bd8a04206e8
parent:      73171:6f56e81da8f6
user:        Florent Xicluna <florent.xicluna at gmail.com>
date:        Fri Oct 28 22:05:12 2011 +0200
summary:
  Merge 3.2

files:
  Doc/library/urllib.request.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 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
@@ -1288,11 +1288,11 @@
      pair: HTTP; protocol
      pair: FTP; protocol
 
-* Currently, only the following protocols are supported: HTTP, (versions 0.9 and
-  1.0),  FTP, and local files.
+* 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 I find the
-  time to hack proper processing of Expiration time headers.
+* The caching feature of :func:`urlretrieve` has been disabled until someone find
+  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