[3.6] Clean up some confusing text left by PROTOCOL_SSLv23 -> PROTOCOL_TLS transition (GH-1355) (#1371)
(cherry picked from commit d4069de5112f0408801ff2479476827bb3e0e8fc)
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 @@
.. 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 @@
.. 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