commit 716c3ac40cae880193dfdbda39a0ca7ed7cd2854
author Georg Brandl <georg@python.org> Thu Aug 30 18:34:23 2007 +0000
committer Georg Brandl <georg@python.org> Thu Aug 30 18:34:23 2007 +0000
tree 78798f2f69c68bfcd713a1235469701614571ce0
parent f4780d03d540ebc4bc5eec6754d23bb00b2329c8

Add 3.0 to the silly list in license.rst too, and update the Doc README.

Doc/license.rst

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 @@
 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::