Merged revisions 69861 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69861 | tarek.ziade | 2009-02-22 01:07:45 +0100 (Sun, 22 Feb 2009) | 1 line
using versionchanged instead of versionadded for distutils doc on sdist default files
........
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 6fed2fa..97ac5be 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -450,10 +450,9 @@
scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val']
)
-All the scripts will also be added to the ``MANIFEST``
-file if no template is provided. See :ref:`manifest`.
-
-.. versionadded:: 2.7
+.. versionchanged:: 2.7
+ All the scripts will also be added to the ``MANIFEST``
+ file if no template is provided. See :ref:`manifest`.
.. _distutils-installing-package-data:
@@ -498,10 +497,10 @@
)
-All the files that match ``package_data`` will be added to the ``MANIFEST``
-file if no template is provided. See :ref:`manifest`.
+.. versionchanged:: 2.7
+ All the files that match ``package_data`` will be added to the ``MANIFEST``
+ file if no template is provided. See :ref:`manifest`.
-.. versionadded:: 2.7
.. _distutils-additional-files:
@@ -539,10 +538,10 @@
files directly in the target directory, an empty string should be given as the
directory.
-All the files that match ``data_files`` will be added to the ``MANIFEST``
-file if no template is provided. See :ref:`manifest`.
+.. versionchanged:: 2.7
+ All the files that match ``data_files`` will be added to the ``MANIFEST``
+ file if no template is provided. See :ref:`manifest`.
-.. versionadded:: 2.7
.. _meta-data:
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
index 5c0e5d0..0c786c5 100644
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -87,14 +87,9 @@
* all files that matches the ``package_data`` metadata.
See :ref:`distutils-installing-package-data`.
- .. versionadded:: 2.7
-
* all files that matches the ``data_files`` metadata.
See :ref:`distutils-additional-files`.
- .. versionadded:: 2.7
-
-
Sometimes this is enough, but usually you will want to specify additional files
to distribute. The typical way to do this is to write a *manifest template*,
called :file:`MANIFEST.in` by default. The manifest template is just a list of