Manually merge r83995: Fix version{added,changed} and spacing in NEWS

diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
index 8a083a2859badb5c32459f4760b5807cb419e5e1..ea5b02c45a87ca07f59f3a972c152061d6aa2539 100644 (file)
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -103,7 +103,7 @@ per line, regular files (or symlinks to them) only.  If you do supply your own
 :file:`MANIFEST`, you must specify everything: the default set of files
 described above does not apply in this case.
 
-.. versionadded:: 3.2
+.. versionadded:: 3.1
    :file:`MANIFEST` files start with a comment indicated they are generated.
    Files without this comment are not overwritten or removed.
 
@@ -205,7 +205,7 @@ distribution::
 
 :option:`-o` is a shortcut for :option:`--manifest-only`.
 
-.. versionchanged:: 3.2
+.. versionchanged:: 3.1
     An existing generated :file:`MANIFEST` will be regenerated without
     :command:`sdist` comparing its modification time to the one of
     :file:`MANIFEST.in` or :file:`setup.py`.

diff --git a/Misc/NEWS b/Misc/NEWS
index 2afb99ad2f1796484f16577897ea3ef27ea1baa1..8b9ef66c4327c4656deda23d3259edf184e031cd 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -84,7 +84,7 @@ Library
 -------
 
 - Issue #8688: MANIFEST files created by distutils now include a magic
-  comment indicating they are generated. Manually maintained MANIFESTs
+  comment indicating they are generated.  Manually maintained MANIFESTs
   without this marker will not be overwritten or removed.
 
 - Issue #7467: when reading a file from a ZIP archive, its CRC is checked