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 6fed2fabbc47dca927740ac58d9b8dd03814943c..97ac5be540e24ef8d6c4da1028cda64c584c87a3 100644 (file)
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -450,10 +450,9 @@ way.  From the PyXML setup script::
          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 @@ The corresponding call to :func:`setup` might be::
          )
 
 
-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 @@ without specifying a target directory, but this is not recommended, and the
 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 5c0e5d04234bca3e48740cc73a63557087e5a4b0..0c786c5a0a7e84d052920eaf2021ebe0b778f3f5 100644 (file)
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -87,14 +87,9 @@ source distribution:
 * 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