summaryrefslogtreecommitdiffstats
path: root/Doc/license.rst
diff options
context:
space:
mode:
Diffstat (limited to 'Doc/license.rst')
-rw-r--r--Doc/license.rst118
1 files changed, 61 insertions, 57 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 6a96dbf..127fc0d 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -31,63 +31,67 @@ All Python releases are Open Source (see http://www.opensource.org/ for the Open
Source Definition). Historically, most, but not all, Python releases have also
been GPL-compatible; the table below summarizes the various releases.
-+----------------+--------------+-----------+------------+-----------------+
-| Release | Derived from | Year | Owner | GPL compatible? |
-+================+==============+===========+============+=================+
-| 0.9.0 thru 1.2 | n/a | 1991-1995 | CWI | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 1.3 thru 1.5.2 | 1.2 | 1995-1999 | CNRI | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 1.6 | 1.5.2 | 2000 | CNRI | no |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.0 | 1.6 | 2000 | BeOpen.com | no |
-+----------------+--------------+-----------+------------+-----------------+
-| 1.6.1 | 1.6 | 2001 | CNRI | no |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.1 | 2.0+1.6.1 | 2001 | PSF | no |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.0.1 | 2.0+1.6.1 | 2001 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.2 | 2.1.1 | 2001 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.1.2 | 2.1.1 | 2002 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.1.3 | 2.1.2 | 2002 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.2.1 | 2.2 | 2002 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.2.2 | 2.2.1 | 2002 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3 | 2.2.2 | 2002-2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.1 | 2.3 | 2002-2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.2 | 2.3.1 | 2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.3 | 2.3.2 | 2003 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.4 | 2.3.3 | 2004 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.3.5 | 2.3.4 | 2005 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4 | 2.3 | 2004 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.1 | 2.4 | 2005 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.2 | 2.4.1 | 2005 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.3 | 2.4.2 | 2006 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.4.4 | 2.4.3 | 2006 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.5 | 2.4 | 2006 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
-| 2.5.1 | 2.5 | 2007 | PSF | yes |
-+----------------+--------------+-----------+------------+-----------------+
++----------------+--------------+------------+------------+-----------------+
+| Release | Derived from | Year | Owner | GPL compatible? |
++================+==============+============+============+=================+
+| 0.9.0 thru 1.2 | n/a | 1991-1995 | CWI | yes |
++----------------+--------------+------------+------------+-----------------+
+| 1.3 thru 1.5.2 | 1.2 | 1995-1999 | CNRI | yes |
++----------------+--------------+------------+------------+-----------------+
+| 1.6 | 1.5.2 | 2000 | CNRI | no |
++----------------+--------------+------------+------------+-----------------+
+| 2.0 | 1.6 | 2000 | BeOpen.com | no |
++----------------+--------------+------------+------------+-----------------+
+| 1.6.1 | 1.6 | 2001 | CNRI | no |
++----------------+--------------+------------+------------+-----------------+
+| 2.1 | 2.0+1.6.1 | 2001 | PSF | no |
++----------------+--------------+------------+------------+-----------------+
+| 2.0.1 | 2.0+1.6.1 | 2001 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.2 | 2.1.1 | 2001 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.1.2 | 2.1.1 | 2002 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.1.3 | 2.1.2 | 2002 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.2.1 | 2.2 | 2002 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.2.2 | 2.2.1 | 2002 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.3 | 2.2.2 | 2002-2003 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.3.1 | 2.3 | 2002-2003 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.3.2 | 2.3.1 | 2003 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.3.3 | 2.3.2 | 2003 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.3.4 | 2.3.3 | 2004 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.3.5 | 2.3.4 | 2005 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.4 | 2.3 | 2004 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.4.1 | 2.4 | 2005 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.4.2 | 2.4.1 | 2005 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.4.3 | 2.4.2 | 2006 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.4.4 | 2.4.3 | 2006 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.5 | 2.4 | 2006 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.5.1 | 2.5 | 2007 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 2.6 | 2.5 | unreleased | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
+| 3.0 | 2.6 | 2007 | PSF | yes |
++----------------+--------------+------------+------------+-----------------+
.. note::