Merged revisions 75478 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75478 | senthil.kumaran | 2009-10-18 07:28:45 +0530 (Sun, 18 Oct 2009) | 3 lines

  Fix a typo.
........

diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index cb8dc553d1b9efd85a9c0bbfe9d7d71ecf61619e..3e75f8c965a4e6ce3e860d6d99a4f3a0c726dd21 100644 (file)
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -195,7 +195,7 @@ The following classes are provided:
    :envvar:`<protocol>_proxy`.  If no proxy environment variables are set, in a
    Windows environment, proxy settings are obtained from the registry's
    Internet Settings section and in a Mac OS X  environment, proxy information
-   is retrieved from from the OS X System Configuration Framework.
+   is retrieved from the OS X System Configuration Framework.
 
    To disable autodetected proxy pass an empty dictionary.