[Python-checkins] r83998 - in python/branches/py3k: Doc/distutils/sourcedist.rst Misc/NEWS

[eric.araujo]

Author: eric.araujo
Date: Sat Aug 14 05:59:54 2010
New Revision: 83998

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


Modified:
   python/branches/py3k/Doc/distutils/sourcedist.rst
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/distutils/sourcedist.rst
==============================================================================
--- python/branches/py3k/Doc/distutils/sourcedist.rst	(original)
+++ python/branches/py3k/Doc/distutils/sourcedist.rst	Sat Aug 14 05:59:54 2010
@@ -103,7 +103,7 @@
 :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 @@
 
 :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`.

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Aug 14 05:59:54 2010
@@ -84,7 +84,7 @@
 -------
 
 - 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