merge 2.7.9 release branch

542125e6 · Benjamin Peterson · daa491b6 · fd0c92fe · 542125e6
Commit 542125e6 authored Dec 06, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Doc/library/ssl.rst Doc/library/ssl.rst +5 -2

No files found.
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -519,8 +519,8 @@ Constants

   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 @@ Constants

   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.