diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2009-10-18 02:01:06 (GMT) |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2009-10-18 02:01:06 (GMT) |
| commit | ede15a56b840a14ad2c0bd4882cb62580ad5da6e (patch) | |
| tree | f7f9c833d97dc4eff35bb8569665f768b0abe55d /Doc | |
| parent | 3ae41accc67615c8fcc879b3eda5bb8c08f003b8 (diff) | |
| download | cpython-ede15a56b840a14ad2c0bd4882cb62580ad5da6e.zip cpython-ede15a56b840a14ad2c0bd4882cb62580ad5da6e.tar.gz cpython-ede15a56b840a14ad2c0bd4882cb62580ad5da6e.tar.bz2 | |
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.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/urllib2.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst index cb8dc55..3e75f8c 100644 --- 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. |