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

[benjamin.peterson]

https://hg.python.org/cpython/rev/628acf7dbc8d
changeset:   93769:628acf7dbc8d
parent:      93765:fbf3747e721c
parent:      93768:8839e2432d11
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 06 11:37:18 2014 -0500
summary:
  merge 3.4

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
@@ -554,8 +554,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::
 
@@ -565,6 +565,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