summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-03-11 01:26:01 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2018-03-11 01:26:01 (GMT)
commit3f439d14ad48f5d4f6017fc814326fb1f6237b53 (patch)
tree5b70fc3cb03ded134d0ae484fb99b62f8e90231c
parentd0826340d96e0953793b86d0b8475d2f43a280b6 (diff)
downloadcpython-3f439d14ad48f5d4f6017fc814326fb1f6237b53.zip
cpython-3f439d14ad48f5d4f6017fc814326fb1f6237b53.tar.gz
cpython-3f439d14ad48f5d4f6017fc814326fb1f6237b53.tar.bz2
bpo-33045: Fix typos in SSL documentation (GH-6065)
(cherry picked from commit 9cf8c42f3231d3f066670d087a997bd1278482a0) Co-authored-by: Matt Eaton <agnosticdev@gmail.com>
-rw-r--r--Doc/library/ssl.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index fc68e30..677e945 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1539,7 +1539,7 @@ to speed up repeated connections from the same clients.
.. method:: SSLContext.load_dh_params(dhfile)
- Load the key generation parameters for Diffie-Helman (DH) key exchange.
+ Load the key generation parameters for Diffie-Hellman (DH) key exchange.
Using DH key exchange improves forward secrecy at the expense of
computational resources (both on the server and on the client).
The *dhfile* parameter should be the path to a file containing DH
@@ -2343,7 +2343,7 @@ with LibreSSL.
Documentation of underlying :mod:`socket` class
`SSL/TLS Strong Encryption: An Introduction <https://httpd.apache.org/docs/trunk/en/ssl/ssl_intro.html>`_
- Intro from the Apache webserver documentation
+ Intro from the Apache HTTP Server documentation
`RFC 1422: Privacy Enhancement for Internet Electronic Mail: Part II: Certificate-Based Key Management <https://www.ietf.org/rfc/rfc1422>`_
Steve Kent