diff options
| author | Nathaniel J. Smith <njs@pobox.com> | 2017-05-02 05:43:31 (GMT) |
|---|---|---|
| committer | Mariatta <Mariatta@users.noreply.github.com> | 2017-05-02 05:43:31 (GMT) |
| commit | d4069de5112f0408801ff2479476827bb3e0e8fc (patch) | |
| tree | 99f70cdcc78dc53f83413e1086a32fab23be27d7 /Doc | |
| parent | 5d7a8d0c13737fd531b722ad76c505ef47aac96a (diff) | |
| download | cpython-d4069de5112f0408801ff2479476827bb3e0e8fc.zip cpython-d4069de5112f0408801ff2479476827bb3e0e8fc.tar.gz cpython-d4069de5112f0408801ff2479476827bb3e0e8fc.tar.bz2 | |
Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition (#1355)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/ssl.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index e394519..6deaded 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -614,13 +614,13 @@ Constants .. data:: PROTOCOL_TLS Selects the highest protocol version that both the client and server support. - Despite the name, this option can select "TLS" protocols as well as "SSL". + Despite the name, this option can select both "SSL" and "TLS" protocols. .. versionadded:: 3.6 .. data:: PROTOCOL_TLS_CLIENT - Auto-negotiate the highest protocol version like :data:`PROTOCOL_SSLv23`, + Auto-negotiate the highest protocol version like :data:`PROTOCOL_TLS`, but only support client-side :class:`SSLSocket` connections. The protocol enables :data:`CERT_REQUIRED` and :attr:`~SSLContext.check_hostname` by default. @@ -629,7 +629,7 @@ Constants .. data:: PROTOCOL_TLS_SERVER - Auto-negotiate the highest protocol version like :data:`PROTOCOL_SSLv23`, + Auto-negotiate the highest protocol version like :data:`PROTOCOL_TLS`, but only support server-side :class:`SSLSocket` connections. .. versionadded:: 3.6 |