[Python-checkins] cpython (merge 2.7 -> 2.7): Merge 2.7.9 release branch

[benjamin.peterson]

https://hg.python.org/cpython/rev/ce72e3c45884
changeset:   93780:ce72e3c45884
branch:      2.7
parent:      93778:6e1a825995e3
parent:      93779:4fc7dfd5ecbd
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Dec 07 14:25:59 2014 -0500
summary:
  Merge 2.7.9 release branch

files:
  Doc/library/urllib2.rst |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
--- a/Doc/library/urllib2.rst
+++ b/Doc/library/urllib2.rst
@@ -292,13 +292,13 @@
    A class to handle opening of HTTP URLs.
 
 
-.. class:: HTTPSHandler([debuglevel[, context[, check_hostname]]])
+.. class:: HTTPSHandler([debuglevel[, context]])
 
-   A class to handle opening of HTTPS URLs. *context* and *check_hostname* have
-   the same meaning as for :class:`httplib.HTTPSConnection`.
+   A class to handle opening of HTTPS URLs. *context* has the same meaning as
+   for :class:`httplib.HTTPSConnection`.
 
    .. versionchanged:: 2.7.9
-      *context* and *check_hostname* were added.
+      *context* added.
 
 
 .. class:: FileHandler()

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