Fixed #6287: documentation for the license field in distutils
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 851c904..bf4eeeb 100644
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -590,6 +590,8 @@
+----------------------+---------------------------+-----------------+--------+
| ``platforms`` | a list of platforms | list of strings | |
+----------------------+---------------------------+-----------------+--------+
+| ``license`` | license for the package | short string | \(6) |
++----------------------+---------------------------+-----------------+--------+
Notes:
@@ -611,6 +613,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 44f30e0..ab00d38 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -327,6 +327,8 @@
Library
-------
+- Issue #6287: Added the license field in Distutils documentation.
+
- Issue #6286: Now Distutils upload command is based on urllib2 instead of
httplib, allowing the usage of http_proxy.