Kaydet (Commit) e23f102c authored tarafından Éric Araujo's avatar Éric Araujo

Fix bad merge

üst 80d1e0ec
...@@ -111,6 +111,10 @@ per line, regular files (or symlinks to them) only. If you do supply your own ...@@ -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 :file:`MANIFEST`, you must specify everything: the default set of files
described above does not apply in this case. 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. See :ref:`manifest_template` section for a syntax reference.
.. _manifest-options: .. _manifest-options:
...@@ -162,10 +166,6 @@ This mechanism can be used when the default list of files is not enough. ...@@ -162,10 +166,6 @@ This mechanism can be used when the default list of files is not enough.
Principle 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 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 set of files to include or exclude from the source distribution. For an
example, let's look at the Distutils' own manifest template:: example, let's look at the Distutils' own manifest template::
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment