summaryrefslogtreecommitdiffstats
path: root/Doc/library/ssl.rst
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-12-20 22:08:39 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-12-20 22:08:39 (GMT)
commit748bad2cd01f107f2efdc8352915e7cee57b6077 (patch)
tree3ec3a76c449da7f6216520ce3c7929d3f5ae22b6 /Doc/library/ssl.rst
parentc054040f86c55eb5f246d334f0bdd68ab8698cba (diff)
downloadcpython-748bad2cd01f107f2efdc8352915e7cee57b6077.zip
cpython-748bad2cd01f107f2efdc8352915e7cee57b6077.tar.gz
cpython-748bad2cd01f107f2efdc8352915e7cee57b6077.tar.bz2
Tidy up ssl whatsnew references, make ssl section formatting consistent.
Also remove some extra blank lines in the ssl doc acctions for tls1.1/1.2, and reflow a paragraph.
Diffstat (limited to 'Doc/library/ssl.rst')
-rw-r--r--Doc/library/ssl.rst5
1 files changed, 1 insertions, 4 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 30cb732..e2d3c3f 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -547,7 +547,6 @@ Constants
.. data:: PROTOCOL_TLSv1_1
-
Selects TLS version 1.1 as the channel encryption protocol.
Available only with openssl version 1.0.1+.
@@ -555,11 +554,9 @@ Constants
.. data:: PROTOCOL_TLSv1_2
-
Selects TLS version 1.2 as the channel encryption protocol. This is the most
modern version, and probably the best choice for maximum protection, if both
- sides can speak it.
- Available only with openssl version 1.0.1+.
+ sides can speak it. Available only with openssl version 1.0.1+.
.. versionadded:: 3.4