Merged revisions 73441 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73441 | tarek.ziade | 2009-06-16 09:29:52 +0200 (Tue, 16 Jun 2009) | 1 line
Fixed #6287: documentation for the license field in distutils
........
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 997dab7..a258e28 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -565,6 +565,8 @@
+----------------------+---------------------------+-----------------+--------+
| ``platforms`` | a list of platforms | list of strings | |
+----------------------+---------------------------+-----------------+--------+
+| ``license`` | license for the package | short string | \(6) |
++----------------------+---------------------------+-----------------+--------+
Notes:
@@ -582,6 +584,13 @@
versions prior to 2.2.3 or 2.3. The list is available from the `PyPI website
<http://pypi.python.org/pypi>`_.
+(6)
+ The ``license`` field is a text indicating the license covering the
+ package where the license is not a selection from the "License" Trove
+ classifiers. See the ``Classifier`` field. Notice that
+ there's a ``licence`` distribution option which is deprecated but still
+ acts as an alias for ``license``.
+
'short string'
A single line of text, not more than 200 characters.