From a85e2175bbaa944d718e312c8befe5b619e9b86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sat, 14 Aug 2010 03:59:54 +0000 Subject: [PATCH] Manually merge r83995: Fix version{added,changed} and spacing in NEWS --- Doc/distutils/sourcedist.rst | 4 ++-- Misc/NEWS | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 8a083a2859b..ea5b02c45a8 100644 --- 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 2afb99ad2f1..8b9ef66c432 100644 --- 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