Merge 2.7.9 release branch
diff --git a/Doc/library/urllib2.rst b/Doc/library/urllib2.rst
index ce0fa98..f599894 100644
--- 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()