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

[benjamin.peterson]

https://hg.python.org/cpython/rev/dd21f8ef033a
changeset:   93782:dd21f8ef033a
parent:      93776:7644f42e3f50
parent:      93781:6dfba0357c92
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Dec 07 17:26:43 2014 -0500
summary:
  merge 3.4

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
@@ -70,7 +70,7 @@
    :meth:`ssl.SSLContext.load_cert_chain` instead, or let
    :func:`ssl.create_default_context` select the system's trusted CA
    certificates for you.  The *check_hostname* parameter is also deprecated; the
-   :attr:`SSLContext.check_hostname` attribute of *context* should be used
+   :attr:`ssl.SSLContext.check_hostname` attribute of *context* should be used
    instead.
 
    Please read :ref:`ssl-security` for more information on best practices.

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