[Python-checkins] bpo-33045: Fix typos in SSL documentation (GH-6065)

Berker Peksag webhook-mailer at python.org
Sat Mar 10 20:26:04 EST 2018


https://github.com/python/cpython/commit/3f439d14ad48f5d4f6017fc814326fb1f6237b53
commit: 3f439d14ad48f5d4f6017fc814326fb1f6237b53
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Berker Peksag <berker.peksag at gmail.com>
date: 2018-03-11T04:26:01+03:00
summary:

bpo-33045: Fix typos in SSL documentation (GH-6065)

(cherry picked from commit 9cf8c42f3231d3f066670d087a997bd1278482a0)

Co-authored-by: Matt Eaton <agnosticdev at gmail.com>

files:
M Doc/library/ssl.rst

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index fc68e3071436..677e94534702 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



More information about the Python-checkins mailing list