Issue #28394: Merge typo fixes from 3.5 into 3.6

vadmium · vadmium · commit fd1df3fef2eb · 2016-10-10T00:28:38.000Z
diff --git 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
@@ -1403,7 +1403,7 @@ def testHTTPConnectionSourceAddress(self):
     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/Misc/HISTORY b/Misc/HISTORY
@@ -9016,7 +9016,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
@@ -708,7 +708,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.
