[Python-checkins] cpython (merge 3.2 -> default): merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/745f9fd9856d
changeset:   74169:745f9fd9856d
parent:      74166:db2f80515807
parent:      74168:cadf43c67f00
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sun Dec 25 11:44:55 2011 +0100
summary:
  merge with 3.2

files:
  Doc/library/http.client.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -435,7 +435,7 @@
    Set the host and the port for HTTP Connect Tunnelling. Normally used when it
    is required to a HTTPS Connection through a proxy server.
 
-   The headers argument should be a mapping of extra HTTP headers to sent
+   The headers argument should be a mapping of extra HTTP headers to send
    with the CONNECT request.
 
    .. versionadded:: 3.2

-- 
Repository URL: http://hg.python.org/cpython