[Python-checkins] cpython: Move a non-PEP 345 field at the end of the metadata fields list

[eric.araujo]

http://hg.python.org/cpython/rev/b5e743bf7f55
changeset:   70681:b5e743bf7f55
user:        Éric Araujo <merwok at netwok.org>
date:        Mon Jun 06 01:58:54 2011 +0200
summary:
  Move a non-PEP 345 field at the end of the metadata fields list

files:
  Doc/packaging/setupcfg.rst |  11 +++++++----
  1 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Doc/packaging/setupcfg.rst b/Doc/packaging/setupcfg.rst
--- a/Doc/packaging/setupcfg.rst
+++ b/Doc/packaging/setupcfg.rst
@@ -218,10 +218,6 @@
    in Distutils1.) A file can be provided in the *description-file* field.
    *optional*
 
-description-file
-   path to a text file that will be used for the
-   **description** field. *optional*
-
 keywords
    A list of additional keywords to be used to assist searching
    for the distribution in a larger catalog. Comma or space-separated.
@@ -282,6 +278,13 @@
    A label, followed by a browsable URL for the project.
    "label, url". The label is limited to 32 signs. *optional*, *multi*
 
+One extra field not present in PEP 345 is supported:
+
+description-file
+   Path to a text file that will be used to fill the ``description`` field.
+   ``description-file`` and ``description`` are mutually exclusive.  *optional*
+
+
 
 Example::
 

-- 
Repository URL: http://hg.python.org/cpython