diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-08-15 00:49:35 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-08-15 00:49:35 (GMT) |
| commit | e23f102cd08fe3264bd5b640c2a528c84f968cc4 (patch) | |
| tree | 185993d525d2b8323b12e274ca134186836c4440 /Doc | |
| parent | 80d1e0ec381952963364e5d3582269e412516f69 (diff) | |
| download | cpython-e23f102cd08fe3264bd5b640c2a528c84f968cc4.zip cpython-e23f102cd08fe3264bd5b640c2a528c84f968cc4.tar.gz cpython-e23f102cd08fe3264bd5b640c2a528c84f968cc4.tar.bz2 | |
Fix bad merge
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/distutils/sourcedist.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst index 9287d8c..c549c90 100644 --- a/Doc/distutils/sourcedist.rst +++ b/Doc/distutils/sourcedist.rst @@ -111,6 +111,10 @@ 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:: 2.7 + :file:`MANIFEST` files start with a comment indicating they are generated. + Files without this comment are not overwritten or removed. + See :ref:`manifest_template` section for a syntax reference. .. _manifest-options: @@ -162,10 +166,6 @@ This mechanism can be used when the default list of files is not enough. Principle --------- -.. versionadded:: 2.7 - :file:`MANIFEST` files start with a comment indicating they are generated. - Files without this comment are not overwritten or removed. - The manifest template has one command per line, where each command specifies a set of files to include or exclude from the source distribution. For an example, let's look at the Distutils' own manifest template:: |