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

[zach.ware]

https://hg.python.org/cpython/rev/ce0bb740d295
changeset:   96875:ce0bb740d295
parent:      96873:87853f158042
parent:      96874:60a4a9ea887d
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Jul 07 00:11:49 2015 -0500
summary:
  Merge 3.5

files:
  Doc/distutils/builtdist.rst  |  2 +-
  Doc/distutils/sourcedist.rst |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/distutils/builtdist.rst b/Doc/distutils/builtdist.rst
--- a/Doc/distutils/builtdist.rst
+++ b/Doc/distutils/builtdist.rst
@@ -100,7 +100,7 @@
 | ``msi``     | Microsoft Installer.         |         |
 +-------------+------------------------------+---------+
 
-.. versionchanged: 3.5
+.. versionchanged:: 3.5
    Added support for the ``xztar`` format.
 
 
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -41,7 +41,7 @@
 | ``tar``   | tar file (:file:`.tar`) |         |
 +-----------+-------------------------+---------+
 
-.. versionchanged: 3.5
+.. versionchanged:: 3.5
    Added support for the ``xztar`` format.
 
 Notes:

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