[Python-checkins] r73443 - in python/branches/py3k: Doc/distutils/setupscript.rst Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Tue Jun 16 09:43:42 2009
New Revision: 73443

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/distutils/setupscript.rst
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/distutils/setupscript.rst
==============================================================================
--- python/branches/py3k/Doc/distutils/setupscript.rst	(original)
+++ python/branches/py3k/Doc/distutils/setupscript.rst	Tue Jun 16 09:43:42 2009
@@ -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.
 

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Tue Jun 16 09:43:42 2009
@@ -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 `$$`