From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 18 Sep 2020 06:37:04 +0000 (+0300)
Subject: [3.8] Remove duplicated words words (GH-20413). (GH-22297)
X-Git-Tag: v3.8.6~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=038688a53bdd92eafd1edf47e6bed414b125a01e;p=thirdparty%2FPython%2Fcpython.git

[3.8] Remove duplicated words words (GH-20413). (GH-22297)

(cherry picked from commit 1c5d1d7304a119040fd3118128bdb412f0cce6a6)
---

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index ea0f13c4f18b..04523e914072 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -615,7 +615,7 @@ Constants
    Possible value for :attr:`SSLContext.verify_flags`. In this mode, only the
    peer cert is checked but none of the intermediate CA certificates. The mode
    requires a valid CRL that is signed by the peer cert's issuer (its direct
-   ancestor CA). If no proper CRL has has been loaded with
+   ancestor CA). If no proper CRL has been loaded with
    :attr:`SSLContext.load_verify_locations`, validation will fail.
 
    .. versionadded:: 3.4
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
index 475e3ab96431..7a86e51116f4 100644
--- a/Doc/whatsnew/3.8.rst
+++ b/Doc/whatsnew/3.8.rst
@@ -1695,7 +1695,7 @@ Deprecated
   :meth:`~gettext.NullTranslations.set_output_charset`, and the *codeset*
   parameter of functions :func:`~gettext.translation` and
   :func:`~gettext.install` are also deprecated, since they are only used for
-  for the ``l*gettext()`` functions.
+  the ``l*gettext()`` functions.
   (Contributed by Serhiy Storchaka in :issue:`33710`.)
 
 * The :meth:`~threading.Thread.isAlive()` method of :class:`threading.Thread`
diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst
index 96208c88d32b..873f53b45037 100644
--- a/Misc/NEWS.d/3.8.0a1.rst
+++ b/Misc/NEWS.d/3.8.0a1.rst
@@ -7034,7 +7034,7 @@ Fix ftplib test for TLS 1.3 by reading from data socket.
 .. nonce: g7TwYm
 .. section: Tests
 
-Fix `test_socket` on AIX AIX 6.1 and later IPv6 zone id supports only
+Fix `test_socket` on AIX 6.1 and later IPv6 zone id supports only
 supported by inet_pton6_zone() Switch to runtime-based platform.system() to
 establish current platform  rather than build-time based sys.platform()
 
diff --git a/Misc/NEWS.d/3.8.0b1.rst b/Misc/NEWS.d/3.8.0b1.rst
index 43a88a37c5cb..5400c0779529 100644
--- a/Misc/NEWS.d/3.8.0b1.rst
+++ b/Misc/NEWS.d/3.8.0b1.rst
@@ -1612,7 +1612,7 @@ versions.
 .. nonce: Zot4sx
 .. section: Documentation
 
-Improve documentation of the stdin, stdout, and stderr arguments of of the
+Improve documentation of the stdin, stdout, and stderr arguments of the
 ``asyncio.subprocess_exec`` function to specify which values are supported.
 Also mention that decoding as text is not supported.