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

[eric.araujo]

http://hg.python.org/cpython/rev/13a74990db8c
changeset:   68764:13a74990db8c
parent:      68760:d825316b73d0
parent:      68763:ceeba01bdd82
user:        Éric Araujo <merwok at netwok.org>
date:        Sun Mar 20 18:32:51 2011 +0100
summary:
  Merge from 3.1

files:
  

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
@@ -1282,7 +1282,7 @@
   you try to fetch a file whose read permissions make it inaccessible; the FTP
   code will try to read it, fail with a 550 error, and then perform a directory
   listing for the unreadable file. If fine-grained control is needed, consider
-  using the :mod:`ftplib` module, subclassing :class:`FancyURLOpener`, or changing
+  using the :mod:`ftplib` module, subclassing :class:`FancyURLopener`, or changing
   *_urlopener* to meet your needs.
 
 

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