diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-12-06 16:37:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-12-06 16:37:18 (GMT) |
| commit | b9859daeeb8ad767d2b2cc56f72736810114dd49 (patch) | |
| tree | 4e7e133bb294de861cb2f69f1b006783f80fe551 | |
| parent | 22293df016773029385c70968252a11b7cb02a42 (diff) | |
| parent | b92fd01189c74c76a70ecf24d723d2f5c0ffc5b9 (diff) | |
| download | cpython-b9859daeeb8ad767d2b2cc56f72736810114dd49.zip cpython-b9859daeeb8ad767d2b2cc56f72736810114dd49.tar.gz cpython-b9859daeeb8ad767d2b2cc56f72736810114dd49.tar.bz2 | |
merge 3.4
| -rw-r--r-- | Doc/library/ssl.rst | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index c4197a5..cd23701 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -554,8 +554,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:: @@ -565,6 +565,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. |