[Python-checkins] cpython (merge 3.6 -> default): Merge typo fixes from 3.6

[martin.panter]

https://hg.python.org/cpython/rev/044e48c396b5
changeset:   105246:044e48c396b5
parent:      105245:821da4891051
parent:      105243:8372b9a325fb
user:        Martin Panter <vadmium+py at gmail.com>
date:        Sun Nov 20 22:18:08 2016 +0000
summary:
  Merge typo fixes from 3.6

files:
  Doc/library/email.message.rst |  2 +-
  Misc/NEWS                     |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst
--- a/Doc/library/email.message.rst
+++ b/Doc/library/email.message.rst
@@ -275,7 +275,7 @@
       only the key will be added.
 
       If the value contains non-ASCII characters, the charset and language may
-      be explicitly controlled by specifing the value as a three tuple in the
+      be explicitly controlled by specifying the value as a three tuple in the
       format ``(CHARSET, LANGUAGE, VALUE)``, where ``CHARSET`` is a string
       naming the charset to be used to encode the value, ``LANGUAGE`` can
       usually be set to ``None`` or the empty string (see :rfc:`2231` for other
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -295,7 +295,7 @@
   if pass invalid string-like object as a name.  Patch by Xiang Zhang.
 
 - Issue #18844: random.choices() now has k as a keyword-only argument
-  to improve the readability of common cases and the come into line
+  to improve the readability of common cases and come into line
   with the signature used in other languages.
 
 - Issue #18893: Fix invalid exception handling in Lib/ctypes/macholib/dyld.py.

-- 
Repository URL: https://hg.python.org/cpython