summaryrefslogtreecommitdiffstats
path: root/Doc/distutils/setupscript.rst
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-02-22 00:10:58 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-02-22 00:10:58 (GMT)
commitc1a2657381f8e5baf9dcabb5ae7e32e2c3dceca0 (patch)
treeb6ffa4180a8db0e985b13a60fada622f0e3c8fe2 /Doc/distutils/setupscript.rst
parentba86fa9d5f24aa33f994d3b7a4bd31fdd8cf70e8 (diff)
downloadcpython-c1a2657381f8e5baf9dcabb5ae7e32e2c3dceca0.zip
cpython-c1a2657381f8e5baf9dcabb5ae7e32e2c3dceca0.tar.gz
cpython-c1a2657381f8e5baf9dcabb5ae7e32e2c3dceca0.tar.bz2
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 ........
Diffstat (limited to 'Doc/distutils/setupscript.rst')
-rw-r--r--Doc/distutils/setupscript.rst19
1 files changed, 9 insertions, 10 deletions
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 @@ 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: