From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Sat, 21 Apr 2018 00:49:07 +0000 (-0400)
Subject: [3.6] Spelling fixes to docs, docstrings, and comments (GH-6374) (#6558)
X-Git-Tag: v3.6.6rc1~171
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82de43fdd5e31fcf31b70b6f9a7d3dd1b9f91537;p=python

[3.6] Spelling fixes to docs, docstrings, and comments (GH-6374) (#6558)

(cherry picked from commit 61f82e0e337f971da57f8f513abfe693edf95aa5)
---

diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst
index 1e64e1066c..b4ed3b41f3 100644
--- a/Doc/library/email.generator.rst
+++ b/Doc/library/email.generator.rst
@@ -185,7 +185,7 @@ to be using :class:`BytesGenerator`, and not :class:`Generator`.
       Convert any bytes with the high bit set as needed using an
       ASCII-compatible :mailheader:`Content-Transfer-Encoding`.  That is,
       transform parts with non-ASCII :mailheader:`Cotnent-Transfer-Encoding`
-      (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatibile
+      (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatible
       :mailheader:`Content-Transfer-Encoding`, and encode RFC-invalid non-ASCII
       bytes in headers using the MIME ``unknown-8bit`` character set, thus
       rendering them RFC-compliant.
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 1ef8a617c4..bf2b52ac23 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -44,7 +44,7 @@ bpo-31860: The font sample in the settings dialog is now editable.
 Edits persist while IDLE remains open.
 Patch by Serhiy Storchake and Terry Jan Reedy.
 
-bpo-31858: Restrict shell prompt manipulaton to the shell.
+bpo-31858: Restrict shell prompt manipulation to the shell.
 Editor and output windows only see an empty last prompt line.  This
 simplifies the code and fixes a minor bug when newline is inserted.
 Sys.ps1, if present, is read on Shell start-up, but is not set or changed.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index faa4868587..8b0441a8e5 100644
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -5586,7 +5586,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
 @unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
 class TestMSWindowsTCPFlags(unittest.TestCase):
     knownTCPFlags = {
-                       # avaliable since long time ago
+                       # available since long time ago
                        'TCP_MAXSEG',
                        'TCP_NODELAY',
                        # available starting with Windows 10 1607