diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-06-16 07:41:29 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-06-16 07:41:29 (GMT) |
| commit | f85679ceea8ba57013027a280811d8c3b071c2d9 (patch) | |
| tree | 4264b1f8a82fe7fbfe8aed60758717b5bcff5e50 /Doc | |
| parent | ab226d3f988d88b747431a043ae4ffc712616f07 (diff) | |
| download | cpython-f85679ceea8ba57013027a280811d8c3b071c2d9.zip cpython-f85679ceea8ba57013027a280811d8c3b071c2d9.tar.gz cpython-f85679ceea8ba57013027a280811d8c3b071c2d9.tar.bz2 | |
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
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/distutils/setupscript.rst | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst index 997dab7..a258e28 100644 --- a/Doc/distutils/setupscript.rst +++ b/Doc/distutils/setupscript.rst @@ -565,6 +565,8 @@ This information includes: +----------------------+---------------------------+-----------------+--------+ | ``platforms`` | a list of platforms | list of strings | | +----------------------+---------------------------+-----------------+--------+ +| ``license`` | license for the package | short string | \(6) | ++----------------------+---------------------------+-----------------+--------+ Notes: @@ -582,6 +584,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. |