diff options
| author | Mariatta <Mariatta@users.noreply.github.com> | 2017-05-02 05:55:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 05:55:53 (GMT) |
| commit | 78b23ab6827410960577c01a33df8afc8fd4496e (patch) | |
| tree | e4addf3a647092fb05340e25c97b653964e6bca7 /Doc/library | |
| parent | 750ff5f8df8faef842470518c58dae2a251114c9 (diff) | |
| download | cpython-78b23ab6827410960577c01a33df8afc8fd4496e.zip cpython-78b23ab6827410960577c01a33df8afc8fd4496e.tar.gz cpython-78b23ab6827410960577c01a33df8afc8fd4496e.tar.bz2 | |
[3.6] Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition (GH-1355) (#1371)
(cherry picked from commit d4069de5112f0408801ff2479476827bb3e0e8fc)
Diffstat (limited to 'Doc/library')
| -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 bbb1374..0ce73c1 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -610,13 +610,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. @@ -625,7 +625,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 |