From 82de43fdd5e31fcf31b70b6f9a7d3dd1b9f91537 Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Fri, 20 Apr 2018 20:49:07 -0400 Subject: [PATCH] [3.6] Spelling fixes to docs, docstrings, and comments (GH-6374) (#6558) (cherry picked from commit 61f82e0e337f971da57f8f513abfe693edf95aa5) --- Doc/library/email.generator.rst | 2 +- Lib/idlelib/NEWS.txt | 2 +- Lib/test/test_socket.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst index 1e64e1066c7da5..b4ed3b41f3d467 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 1ef8a617c4adc7..bf2b52ac2338c1 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 faa4868587cdc2..8b0441a8e52d24 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -5586,7 +5586,7 @@ def test_sendmsg_afalg_args(self): @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