mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge from 3.6

Browse source
This commit is contained in:
Berker Peksag 2017-02-06 13:37:45 +03:00
commit 7b620a448e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Doc/library/ssl.rst
View file

@ -636,7 +636,7 @@ Constants
.. deprecated:: 3.6 .. deprecated:: 3.6
Use data:`PROTOCOL_TLS` instead. Use :data:`PROTOCOL_TLS` instead.
.. data:: PROTOCOL_SSLv2 .. data:: PROTOCOL_SSLv2
@ -667,7 +667,7 @@ Constants
.. deprecated:: 3.6 .. deprecated:: 3.6
OpenSSL has deprecated all version specific protocols. Use the default OpenSSL has deprecated all version specific protocols. Use the default
protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
.. data:: PROTOCOL_TLSv1 .. data:: PROTOCOL_TLSv1
@ -676,7 +676,7 @@ Constants
.. deprecated:: 3.6 .. deprecated:: 3.6
OpenSSL has deprecated all version specific protocols. Use the default OpenSSL has deprecated all version specific protocols. Use the default
protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
.. data:: PROTOCOL_TLSv1_1 .. data:: PROTOCOL_TLSv1_1
@ -688,7 +688,7 @@ Constants
.. deprecated:: 3.6 .. deprecated:: 3.6
OpenSSL has deprecated all version specific protocols. Use the default OpenSSL has deprecated all version specific protocols. Use the default
protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
.. data:: PROTOCOL_TLSv1_2 .. data:: PROTOCOL_TLSv1_2
@ -701,7 +701,7 @@ Constants
.. deprecated:: 3.6 .. deprecated:: 3.6
OpenSSL has deprecated all version specific protocols. Use the default OpenSSL has deprecated all version specific protocols. Use the default
protocol data:`PROTOCOL_TLS` with flags like data:`OP_NO_SSLv3` instead. protocol :data:`PROTOCOL_TLS` with flags like :data:`OP_NO_SSLv3` instead.
.. data:: OP_ALL .. data:: OP_ALL