Issue #28394: Merge typo fixes from 3.6

7 files changed, 7 insertions, 7 deletions

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 3c6c0fd..257bcd7 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -610,7 +610,7 @@ iterations of the loop.
 .. opcode:: SETUP_ANNOTATIONS
 
    Checks whether ``__annotations__`` is defined in ``locals()``, if not it is
-   set up to an empty ``dict``. This opcode is only emmitted if a class
+   set up to an empty ``dict``. This opcode is only emitted if a class
    or module body contains :term:`variable annotations <variable annotation>`
    statically.
 
diff --git a/Lib/lib2to3/Grammar.txt b/Lib/lib2to3/Grammar.txt
index 2f02e6f..2abd5ee 100644
--- a/Lib/lib2to3/Grammar.txt
+++ b/Lib/lib2to3/Grammar.txt
@@ -153,7 +153,7 @@ arglist: argument (',' argument)* [',']
 # to our LL(1) parser. Even though 'test' includes '*expr' in star_expr,
 # we explicitly match '*' here, too, to give it proper precedence.
 # Illegal combinations and orderings are blocked in ast.c:
-# multiple (test comp_for) arguements are blocked; keyword unpackings
+# multiple (test comp_for) arguments are blocked; keyword unpackings
 # that precede iterable unpackings are blocked; etc.
 argument: ( test [comp_for] |
             test '=' test |
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index c613c57..68f6946 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -1403,7 +1403,7 @@ class SourceAddressTest(TestCase):
     def testHTTPSConnectionSourceAddress(self):
         self.conn = client.HTTPSConnection(HOST, self.port,
                 source_address=('', self.source_port))
-        # We don't test anything here other the constructor not barfing as
+        # We don't test anything here other than the constructor not barfing as
         # this code doesn't deal with setting up an active running SSL server
         # for an ssl_wrapped connect() to actually return from.
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index ad30105..d203cdd 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3475,7 +3475,7 @@ if _have_threads:
             client_context.verify_mode = ssl.CERT_REQUIRED
             client_context.load_verify_locations(SIGNING_CA)
 
-            # first conncetion without session
+            # first connection without session
             stats = server_params_test(client_context, server_context)
             session = stats['session']
             self.assertTrue(session.id)
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 6771bc4..6cadaec 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -13317,7 +13317,7 @@ Library
 - Issue #5976: Fixed Distutils test_check_environ.
 
 - Issue #5941: Distutils build_clib command was not working anymore because
-  of an incomplete costumization of the archiver command. Added ARFLAGS in the
+  of an incomplete customization of the archiver command. Added ARFLAGS in the
   Makefile besides AR and make Distutils use it. Original patch by David
   Cournapeau.
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 6b479cb..4dd67ec 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -743,7 +743,7 @@ Build
 
 - Issue #21590: Support for DTrace and SystemTap probes.
 
-- Issue #26307: The profile-opt build now applys PGO to the built-in modules.
+- Issue #26307: The profile-opt build now applies PGO to the built-in modules.
 
 - Issue #26539: Add the --with-optimizations flag to turn on LTO and PGO build
   support when available.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index ef17981..7aae5c7 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -770,7 +770,7 @@ dir_fd_converter(PyObject *o, void *p)
  *   path.narrow
  *     Points to the path if it was expressed as bytes,
  *     or it was Unicode and was encoded to bytes. (On Windows,
- *     is an non-zero integer if the path was expressed as bytes.
+ *     is a non-zero integer if the path was expressed as bytes.
  *     The type is deliberately incompatible to prevent misuse.)
  *   path.fd
  *     Contains a file descriptor if path.accept_fd was true