Merge 3.2

d39a4d75 · Florent Xicluna · 46f5d146 · 83386dac · d39a4d75
Commit d39a4d75 authored Oct 28, 2011 by Florent Xicluna
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Doc/library/urllib.request.rst Doc/library/urllib.request.rst +4 -4

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