summaryrefslogtreecommitdiffstats
path: root/Doc/distutils
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-08-14 03:59:54 (GMT)
committerÉric Araujo <merwok@netwok.org>2010-08-14 03:59:54 (GMT)
commita85e2175bbaa944d718e312c8befe5b619e9b86c (patch)
tree11750410108264e7cc443ab6e322dccfc2ecfc13 /Doc/distutils
parentda668ff24fc7d959ad2938f128281dcc49d168d8 (diff)
downloadcpython-a85e2175bbaa944d718e312c8befe5b619e9b86c.zip
cpython-a85e2175bbaa944d718e312c8befe5b619e9b86c.tar.gz
cpython-a85e2175bbaa944d718e312c8befe5b619e9b86c.tar.bz2
Manually merge r83995: Fix version{added,changed} and spacing in NEWS
Diffstat (limited to 'Doc/distutils')
-rw-r--r--Doc/distutils/sourcedist.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
index 8a083a2..ea5b02c 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`.