summaryrefslogtreecommitdiffstats
path: root/Doc/library/urllib.rst
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/library/urllib.rst')
-rw-r--r--Doc/library/urllib.rst6
1 files changed, 4 insertions, 2 deletions
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 @@ High-level interface
.. 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