Commit c1a26573 authored by Tarek Ziadé's avatar Tarek Ziadé

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
........
parent ba86fa9d
...@@ -450,10 +450,9 @@ way. From the PyXML setup script:: ...@@ -450,10 +450,9 @@ way. From the PyXML setup script::
scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val'] scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val']
) )
All the scripts will also be added to the ``MANIFEST`` .. versionchanged:: 2.7
file if no template is provided. See :ref:`manifest`. All the scripts will also be added to the ``MANIFEST``
file if no template is provided. See :ref:`manifest`.
.. versionadded:: 2.7
.. _distutils-installing-package-data: .. _distutils-installing-package-data:
...@@ -498,10 +497,10 @@ The corresponding call to :func:`setup` might be:: ...@@ -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`` .. versionchanged:: 2.7
file if no template is provided. See :ref:`manifest`. 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: .. _distutils-additional-files:
...@@ -539,10 +538,10 @@ without specifying a target directory, but this is not recommended, and the ...@@ -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 files directly in the target directory, an empty string should be given as the
directory. directory.
All the files that match ``data_files`` will be added to the ``MANIFEST`` .. versionchanged:: 2.7
file if no template is provided. See :ref:`manifest`. 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: .. _meta-data:
......
...@@ -87,14 +87,9 @@ source distribution: ...@@ -87,14 +87,9 @@ source distribution:
* all files that matches the ``package_data`` metadata. * all files that matches the ``package_data`` metadata.
See :ref:`distutils-installing-package-data`. See :ref:`distutils-installing-package-data`.
.. versionadded:: 2.7
* all files that matches the ``data_files`` metadata. * all files that matches the ``data_files`` metadata.
See :ref:`distutils-additional-files`. See :ref:`distutils-additional-files`.
.. versionadded:: 2.7
Sometimes this is enough, but usually you will want to specify additional files 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*, 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 called :file:`MANIFEST.in` by default. The manifest template is just a list of
......
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