Merge: Reflow paragraphs.

(I got a merge conflict on this in urllib.request.rst, which makes no sense to
me.  Hopefully I didn't screw up the previous 3.3 commit.)

1 files changed, 4 insertions, 4 deletions

diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index 77ef505..b683ab6 100644
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -523,10 +523,10 @@ Proxies
 
 **urllib** will auto-detect your proxy settings and use those. This is through
 the ``ProxyHandler``, which is part of the normal handler chain when a proxy
-setting is detected.  Normally that's
-a good thing, but there are occasions when it may not be helpful [#]_. One way
-to do this is to setup our own ``ProxyHandler``, with no proxies defined. This
-is done using similar steps to setting up a `Basic Authentication`_ handler : ::
+setting is detected.  Normally that's a good thing, but there are occasions
+when it may not be helpful [#]_. One way to do this is to setup our own
+``ProxyHandler``, with no proxies defined. This is done using similar steps to
+setting up a `Basic Authentication`_ handler : ::
 
     >>> proxy_support = urllib.request.ProxyHandler({})
     >>> opener = urllib.request.build_opener(proxy_support)