Index: Doc/library/urllib2.rst
===================================================================
--- Doc/library/urllib2.rst	(revision 75452)
+++ Doc/library/urllib2.rst	(working copy)
@@ -53,6 +53,9 @@
    default installed global :class:`OpenerDirector` uses :class:`UnknownHandler` to
    ensure this never happens).
 
+   In addition, default installed :class:`ProxyHandler` makes sure the requests
+   are handled through the proxy when they are set.
+
    .. versionchanged:: 2.6
       *timeout* was added.
 
@@ -187,8 +190,13 @@
 .. class:: ProxyHandler([proxies])
 
    Cause requests to go through a proxy. If *proxies* is given, it must be a
-   dictionary mapping protocol names to URLs of proxies. The default is to read the
-   list of proxies from the environment variables :envvar:`<protocol>_proxy`.
+   dictionary mapping protocol names to URLs of proxies. The default is to read
+   the list of proxies from the environment variables
+   :envvar:`<protocol>_proxy`.  In a Windows environment, if no proxy
+   environment variables are set, proxy settings are obtained from the
+   registry's Internet Settings section.  In a Mac OS X  environment, proxy
+   information is retrieved from from the OS X System Configuration Framework.
+
    To disable autodetected proxy pass an empty dictionary.
 
 
Index: Doc/library/urllib.rst
===================================================================
--- Doc/library/urllib.rst	(revision 75452)
+++ Doc/library/urllib.rst	(working copy)
@@ -96,9 +96,11 @@
 
    .. 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
    empty dictionary causes no proxies to be used, and ``None`` (the default value)