Merge #7152: Clarify that ProxyHandler is added only if proxy settings are detected.

Behavior confirmation and initial patch by Jessica McKellar.

diff --cc Doc/library/urllib.request.rst
index ef80a924a716185b31f3b4fa53ba6889a8f771b2,0ccfda2c67fd82fdda08329097adf396d5382b54..a027c534593425a324c829f00ed66483167a9d30
--- 1/Doc/library/urllib.request.rst
--- 2/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@@ -126,10 -128,11 +128,11 @@@ The :mod:`urllib.request` module define
     subclasses of :class:`BaseHandler` (in which case it must be possible to call
     the constructor without any parameters).  Instances of the following classes
     will be in front of the *handler*\s, unless the *handler*\s contain them,
-    instances of them or subclasses of them: :class:`ProxyHandler`,
+    instances of them or subclasses of them: :class:`ProxyHandler` (if proxy
+    settings are detected),
     :class:`UnknownHandler`, :class:`HTTPHandler`, :class:`HTTPDefaultErrorHandler`,
     :class:`HTTPRedirectHandler`, :class:`FTPHandler`, :class:`FileHandler`,
 -   :class:`HTTPErrorProcessor`.
 +   :class:`HTTPErrorProcessor`, :class:`DataHandler`.
  
     If the Python installation has SSL support (i.e., if the :mod:`ssl` module
     can be imported), :class:`HTTPSHandler` will also be added.

diff --cc Misc/ACKS
Simple merge