[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[terry.reedy]

https://hg.python.org/cpython/rev/60b266d7dcbd
changeset:   99817:60b266d7dcbd
parent:      99815:9b21dfd71561
parent:      99816:3b860ce5bb51
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sat Jan 09 03:28:01 2016 -0500
summary:
  Merge with 3.5

files:
  Doc/extending/building.rst |  2 +-
  Misc/ACKS                  |  1 +
  2 files changed, 2 insertions(+), 1 deletions(-)


diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -81,7 +81,7 @@
 function. This takes a variable number of keyword arguments, of which the
 example above uses only a subset. Specifically, the example specifies
 meta-information to build packages, and it specifies the contents of the
-package.  Normally, a package will contain of addition modules, like Python
+package.  Normally, a package will contain addition modules, like Python
 source modules, documentation, subpackages, etc. Please refer to the distutils
 documentation in :ref:`distutils-index` to learn more about the features of
 distutils; this section explains building extension modules only.
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -793,6 +793,7 @@
 Andrew Kuchling
 Dave Kuhlman
 Jon Kuhn
+Upendra Kumar
 Toshio Kuratomi
 Ilia Kurenkov
 Vladimir Kushnir

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