From: Senthil Kumaran <senthil@uthcode.com>
Date: Tue, 19 Mar 2013 07:58:46 +0000 (-0700)
Subject: #17460 - merge from 3.2
X-Git-Tag: v3.4.0a1~1163^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f306c03d34441cb7b3a526d176ff39cbf484d63;p=thirdparty%2FPython%2Fcpython.git

#17460 - merge from 3.2
---

2f306c03d34441cb7b3a526d176ff39cbf484d63
diff --cc Doc/library/http.client.rst
index 2d93aa47c386,7423a4cd361a..8137573aa8b1
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@@ -51,7 -51,7 +51,7 @@@ The module provides the following class
     .. versionchanged:: 3.2
        *source_address* was added.
  
-    .. versionchanged:: 3.2
 -   .. deprecated:: 3.2
++   .. deprecated-removed:: 3.2 3.4
        The *strict* parameter is deprecated.  HTTP 0.9-style "Simple Responses"
        are not supported anymore.
  
@@@ -89,7 -89,7 +89,7 @@@
        This class now supports HTTPS virtual hosts if possible (that is,
        if :data:`ssl.HAS_SNI` is true).
  
-    .. versionchanged:: 3.2
 -   .. deprecated:: 3.2
++   .. deprecated-removed:: 3.2 3.4
        The *strict* parameter is deprecated.  HTTP 0.9-style "Simple Responses"
        are not supported anymore.
  
@@@ -99,7 -99,7 +99,7 @@@
     Class whose instances are returned upon successful connection.  Not
     instantiated directly by user.
  
-    .. versionchanged:: 3.2
 -   .. deprecated:: 3.2
++   .. deprecated-removed:: 3.2 3.4
        The *strict* parameter is deprecated.  HTTP 0.9-style "Simple Responses"
        are not supported anymore.