Merged revisions 76787-76789 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76787 | benjamin.peterson | 2009-12-13 08:21:46 -0600 (Sun, 13 Dec 2009) | 9 lines

  Merged revisions 76785 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r76785 | benjamin.peterson | 2009-12-13 08:18:08 -0600 (Sun, 13 Dec 2009) | 1 line

    add 2.6.x point releases
  ........
................
  r76788 | benjamin.peterson | 2009-12-13 08:23:30 -0600 (Sun, 13 Dec 2009) | 1 line

  fix markup
................
  r76789 | benjamin.peterson | 2009-12-13 08:26:42 -0600 (Sun, 13 Dec 2009) | 1 line

  update 3.x versions
................
This commit is contained in:
Benjamin Peterson 2009-12-13 14:29:42 +00:00
parent b7a24f91d5
commit 3d9ff88c76
2 changed files with 18 additions and 0 deletions

View File

@ -92,8 +92,20 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+
| 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 |
+----------------+--------------+------------+------------+-----------------+
.. note::

View File

@ -59,7 +59,13 @@ the various releases.
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
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
Footnotes: