From: Nathaniel J. Smith Date: Tue, 2 May 2017 05:43:31 +0000 (-0700) Subject: Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition ... X-Git-Tag: v3.7.0a1~881 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4069de5112f0408801ff2479476827bb3e0e8fc;p=python Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition (#1355) --- diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index e3945191f5..6deaded0d6 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