[Python-checkins] r73444 - in python/branches/release30-maint: Doc/distutils/setupscript.rst Misc/NEWS

Tue Jun 16 09:45:40 CEST 2009

Author: tarek.ziade
Date: Tue Jun 16 09:45:39 2009
New Revision: 73444
Log:
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 (2009年6月16日) | 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 (2009年6月16日) | 1 line
 
 Fixed #6287: documentation for the license field in distutils
 ........
................
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Doc/distutils/setupscript.rst
 python/branches/release30-maint/Misc/NEWS
Modified: python/branches/release30-maint/Doc/distutils/setupscript.rst
==============================================================================

--- python/branches/release30-maint/Doc/distutils/setupscript.rst	(original)
+++ python/branches/release30-maint/Doc/distutils/setupscript.rst	Tue Jun 16 09:45:39 2009
@@ -563,6 +563,8 @@
 +----------------------+---------------------------+-----------------+--------+
 | ``platforms`` | a list of platforms | list of strings | |
 +----------------------+---------------------------+-----------------+--------+
+| ``license`` | license for the package | short string | \(6) |
++----------------------+---------------------------+-----------------+--------+
 
 Notes:
 
@@ -580,6 +582,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.
 
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Tue Jun 16 09:45:39 2009
@@ -330,6 +330,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 `$$`
