Merge 3.2 branch.

birkenfeld · birkenfeld · commit deb852db71db · 2011-07-23T08:06:00.000+02:00
diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
@@ -140,7 +140,7 @@ This is done as follows::
     name=Somebody+Here&language=Python&location=Northampton
     >>> url = 'http://www.example.com/example.cgi'
     >>> full_url = url + '?' + url_values
-    >>> data = urllib.request.open(full_url)
+    >>> data = urllib.request.urlopen(full_url)
 
 Notice that the full URL is created by adding a ``?`` to the URL, followed by
 the encoded values.
