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

[benjamin.peterson]

https://hg.python.org/cpython/rev/3b370dbb85b7
changeset:   93767:3b370dbb85b7
branch:      2.7
parent:      93763:a8e6ea473db2
parent:      93766:f18b37befb6c
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 06 11:36:48 2014 -0500
summary:
  merge 2.7.9 release branch

files:
  Doc/library/ssl.rst |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -519,8 +519,8 @@
 
    Selects SSL version 2 as the channel encryption protocol.
 
-   This protocol is not available if OpenSSL is compiled with OPENSSL_NO_SSL2
-   flag.
+   This protocol is not available if OpenSSL is compiled with the
+   ``OPENSSL_NO_SSL2`` flag.
 
    .. warning::
 
@@ -530,6 +530,9 @@
 
    Selects SSL version 3 as the channel encryption protocol.
 
+   This protocol is not be available if OpenSSL is compiled with the
+   ``OPENSSL_NO_SSLv3`` flag.
+
    .. warning::
 
       SSL version 3 is insecure.  Its use is highly discouraged.

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