# HG changeset patch
# User Georg Brandl <georg@python.org>
# Date 1379843152 -7200
# Sun Sep 22 11:45:52 2013 +0200
# Node ID 43f9fb63454177020996344bc00946a83ed2c0b9
# Parent dab3561dc4f37cdd95613e1724d6809b031a642e
Closes #19043: remove detailed listing of versions from license files
Since all versions since 2.2 are under the same licensing terms,
this saves the release manager from touching the two files for
very new minor release.
diff --git a/Doc/license.rst b/Doc/license.rst
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -50,81 +50,11 @@
+----------------+--------------+------------+------------+-----------------+
| 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 | 2008 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 2.6.1 | 2.6 | 2008 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 2.6.2 | 2.6.1 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 2.6.3 | 2.6.2 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 2.6.4 | 2.6.3 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.0 | 2.6 | 2008 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.0.1 | 3.0 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1 | 3.0.1 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.1 | 3.1 | 2009 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.2 | 3.1.1 | 2010 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.3 | 3.1.2 | 2010 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.1.4 | 3.1.3 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2 | 3.1 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.1 | 3.2 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.2 | 3.2.1 | 2011 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.3 | 3.2.2 | 2012 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.2.4 | 3.2.3 | 2013 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.3.0 | 3.2 | 2012 | PSF | yes |
-+----------------+--------------+------------+------------+-----------------+
-| 3.3.1 | 3.3.0 | 2013 | PSF | yes |
+| 2.2 and above | 2.1.1 | 2001-now | PSF | yes |
+----------------+--------------+------------+------------+-----------------+
.. note::
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -36,47 +36,9 @@
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 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 2002-2003 PSF yes
- 2.3.3 2.3.2 2002-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.5.2 2.5.1 2008 PSF yes
- 2.5.3 2.5.2 2008 PSF yes
- 2.6 2.5 2008 PSF yes
- 2.6.1 2.6 2008 PSF yes
- 2.6.2 2.6.1 2009 PSF yes
- 2.6.3 2.6.2 2009 PSF yes
- 2.6.4 2.6.3 2009 PSF yes
- 2.6.5 2.6.4 2010 PSF yes
- 3.0 2.6 2008 PSF yes
- 3.0.1 3.0 2009 PSF yes
- 3.1 3.0.1 2009 PSF yes
- 3.1.1 3.1 2009 PSF yes
- 3.1.2 3.1.1 2010 PSF yes
- 3.1.3 3.1.2 2010 PSF yes
- 3.1.4 3.1.3 2011 PSF yes
- 3.2 3.1 2011 PSF yes
- 3.2.1 3.2 2011 PSF yes
- 3.2.2 3.2.1 2011 PSF yes
- 3.2.3 3.2.2 2012 PSF yes
- 3.2.4 3.2.3 2013 PSF yes
- 3.3.0 3.2 2012 PSF yes
- 3.3.1 3.3.0 2013 PSF yes
+ 2.2 and above 2.1.1 2001-now PSF yes
Footnotes: