Merged revisions 75474 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75474 | senthil.kumaran | 2009-10-18 06:54:41 +0530 (Sun, 18 Oct 2009) | 2 lines
Fix for Issue7155 - urllib do not document default use of system proxy configuration
........
diff --git a/Doc/library/urllib.rst b/Doc/library/urllib.rst
index 905c324..68b57aa 100644
--- a/Doc/library/urllib.rst
+++ b/Doc/library/urllib.rst
@@ -96,8 +96,10 @@
.. index:: single: Internet Config
- In a Macintosh environment, :func:`urlopen` will retrieve proxy information from
- Internet Config.
+ In a Mac OS X environment, :func:`urlopen` will retrieve proxy information
+ from the OS X System Configuration Framework, which can be managed with
+ Network System Preferences panel.
+
Alternatively, the optional *proxies* argument may be used to explicitly specify
proxies. It must be a dictionary mapping scheme names to proxy URLs, where an