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 13c42b6..e7c6300 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -589,6 +589,8 @@
+----------------------+---------------------------+-----------------+--------+
| ``platforms`` | a list of platforms | list of strings | |
+----------------------+---------------------------+-----------------+--------+
+| ``license`` | license for the package | short string | \(6) |
++----------------------+---------------------------+-----------------+--------+
Notes:
@@ -610,6 +612,13 @@
The ``long_description`` field is used by PyPI when you are registering a
package, to build its home page.
+(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.
diff --git a/Misc/NEWS b/Misc/NEWS
index 1ec5c53..9ccb472 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -800,6 +800,8 @@
Library
-------
+- Issue #6287: Added the license field in Distutils documentation.
+
- Issue #6263: Fixed syntax error in distutils.cygwincompiler.
- Issue #5201: distutils.sysconfig.parse_makefile() now understands `$$`