diff options
| author | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2011-05-24 12:33:32 +0000 |
|---|---|---|
| committer | milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04> | 2011-05-24 12:33:32 +0000 |
| commit | 6cbc7f1719a368dec75d1d0a4261eb0c536a6504 (patch) | |
| tree | 47dbae873183384e699e8cd63eeb8aaa273ddf85 /docutils/docs/dev | |
| parent | c38862f4a68b0524a1db1aaa278f1da64129e0f8 (diff) | |
| download | docutils-6cbc7f1719a368dec75d1d0a4261eb0c536a6504.tar.gz | |
Update the copyright/licensing info. Fixes [3304675]
BSD license is not used in Docutils.
Some new parts use the Apache License version 2.0.
PSF contributing policy is that "contributors remain copyright holders
of their contributions" (http://www.python.org/psf/contrib/).
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@7040 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
Diffstat (limited to 'docutils/docs/dev')
| -rw-r--r-- | docutils/docs/dev/policies.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/docutils/docs/dev/policies.txt b/docutils/docs/dev/policies.txt index 3bb115cbf..7b695a53d 100644 --- a/docutils/docs/dev/policies.txt +++ b/docutils/docs/dev/policies.txt @@ -164,16 +164,17 @@ intentions regarding copyright, in one of the following ways: accompanying license file, or a license URL. One of the goals of the Docutils project, once complete, is to be -incorporated into the Python standard library. At that time copyright -of the Docutils code will be assumed by or transferred to the Python -Software Foundation (PSF), and will be released under Python's -license. If the copyright/license option is chosen for new files, the -license should be compatible with Python's current license, and the -author(s) of the files should be willing to assign copyright to the -PSF. The PSF accepts the `Academic Free License v. 2.1 +incorporated into the Python standard library. At that time, the +Docutils code will be released under Python's license. If the +copyright/license option is chosen for new files, the license should +be compatible with Python's current license, and the author(s) of the +files should be willing to sign a `Contributor Agreement` (see +`Contributing to the PSF`_). As initial license for contributions, +the PSF accepts the `Academic Free License v. 2.1 <http://opensource.org/licenses/afl-2.1.php>`_ and the `Apache License, Version 2.0 <http://opensource.org/licenses/apache2.0.php>`_. +.. _Contributing to the PSF: http://www.python.org/psf/contrib/ Subversion Repository ===================== |