[Python-checkins] r75479 - in python/branches/release26-maint: Doc/library/urllib2.rst
senthil.kumaran
python-checkins at python.org
Sun Oct 18 04:01:06 CEST 2009
Author: senthil.kumaran
Date: Sun Oct 18 04:01:06 2009
New Revision: 75479
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/library/urllib2.rst
Modified: python/branches/release26-maint/Doc/library/urllib2.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/urllib2.rst (original)
+++ python/branches/release26-maint/Doc/library/urllib2.rst Sun Oct 18 04:01:06 2009
@@ -195,7 +195,7 @@
: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.
More information about the Python-checkins
mailing list