traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Éric Araujo 2010-08-14 03:59:54 +00:00
parent da668ff24f
commit a85e2175bb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/distutils/sourcedist.rst
View File

@ -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`.

2
Misc/NEWS
View File

@ -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