Merged revisions 73443 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73443 | tarek.ziade | 2009-06-16 09:43:42 +0200 (Tue, 16 Jun 2009) | 9 lines

  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 666b7d627403ac644f4f22b35a8b768ebbd4579f..59c9b83f9cb188b480eb3e6ee777afc798c72215 100644 (file)
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -563,6 +563,8 @@ This information includes:
 +----------------------+---------------------------+-----------------+--------+
 | ``platforms``        | a list of platforms       | list of strings |        |
 +----------------------+---------------------------+-----------------+--------+
+| ``license``          | license for the package   | short string    | \(6)   |
++----------------------+---------------------------+-----------------+--------+
 
 Notes:
 
@@ -580,6 +582,13 @@ Notes:
    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.
 

diff --git a/Misc/NEWS b/Misc/NEWS
index bc3f41d2e26a64ae1b01b41f0a9f37bff927303d..1b61ff7506eb3c42b00ec28775890662ede1f77d 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -330,6 +330,8 @@ Core and Builtins
 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 `$$`