Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 716c3ac

Browse files
birkenfeldbirkenfeld
committed
Add 3.0 to the silly list in license.rst too, and update the Doc README.
1 parent f4780d0 commit 716c3ac

2 files changed

Lines changed: 72 additions & 63 deletions

File tree

‎Doc/README.txt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ those familiar with the previous docs written in LaTeX.
1414
Building the docs
1515
=================
1616

17-
You need to install Python 2.5 or higher; the toolset used to build the docs are
18-
written in Python. The toolset used to build the documentation is called
19-
*Sphinx*, it is not included in this tree, but maintained separately in the
20-
Python Subversion repository. Also needed are Jinja, a templating engine
21-
(included in Sphinx as a Subversion external), and optionally Pygments, a code
22-
highlighter.
17+
You need to install Python 2.5.1 or higher (but Python 3.0 is not supported yet);
18+
the toolset used to build the docs are written in Python. The toolset used
19+
to build the documentation is called *Sphinx*, it is not included in this
20+
tree, but maintained separately in the Python Subversion repository. Also
21+
needed are Jinja, a templating engine (included in Sphinx as a Subversion
22+
external), and optionally Pygments, a code highlighter.
2323

2424

2525
Using make
@@ -34,6 +34,11 @@ to check out the necessary toolset in the `tools/` subdirectory and build the
3434
HTML output files. To view the generated HTML, point your favorite browser at
3535
the top-level index `build/html/index.html` after running "make".
3636

37+
To use a Python interpreter that's not called ``python``, use the standard
38+
way to set Makefile variables, using e.g. ::
39+
40+
make html PYTHON=/usr/bin/python2.5
41+
3742
Available make targets are:
3843

3944
* "html", which builds standalone HTML files for offline viewing.

‎Doc/license.rst‎

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -31,63 +31,67 @@ All Python releases are Open Source (see http://www.opensource.org/ for the Open
3131
Source Definition). Historically, most, but not all, Python releases have also
3232
been GPL-compatible; the table below summarizes the various releases.
3333

34-
+----------------+--------------+-----------+------------+-----------------+
35-
| Release | Derived from | Year | Owner | GPL compatible? |
36-
+================+==============+===========+============+=================+
37-
| 0.9.0 thru 1.2 | n/a | 1991-1995 | CWI | yes |
38-
+----------------+--------------+-----------+------------+-----------------+
39-
| 1.3 thru 1.5.2 | 1.2 | 1995-1999 | CNRI | yes |
40-
+----------------+--------------+-----------+------------+-----------------+
41-
| 1.6 | 1.5.2 | 2000 | CNRI | no |
42-
+----------------+--------------+-----------+------------+-----------------+
43-
| 2.0 | 1.6 | 2000 | BeOpen.com | no |
44-
+----------------+--------------+-----------+------------+-----------------+
45-
| 1.6.1 | 1.6 | 2001 | CNRI | no |
46-
+----------------+--------------+-----------+------------+-----------------+
47-
| 2.1 | 2.0+1.6.1 | 2001 | PSF | no |
48-
+----------------+--------------+-----------+------------+-----------------+
49-
| 2.0.1 | 2.0+1.6.1 | 2001 | PSF | yes |
50-
+----------------+--------------+-----------+------------+-----------------+
51-
| 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes |
52-
+----------------+--------------+-----------+------------+-----------------+
53-
| 2.2 | 2.1.1 | 2001 | PSF | yes |
54-
+----------------+--------------+-----------+------------+-----------------+
55-
| 2.1.2 | 2.1.1 | 2002 | PSF | yes |
56-
+----------------+--------------+-----------+------------+-----------------+
57-
| 2.1.3 | 2.1.2 | 2002 | PSF | yes |
58-
+----------------+--------------+-----------+------------+-----------------+
59-
| 2.2.1 | 2.2 | 2002 | PSF | yes |
60-
+----------------+--------------+-----------+------------+-----------------+
61-
| 2.2.2 | 2.2.1 | 2002 | PSF | yes |
62-
+----------------+--------------+-----------+------------+-----------------+
63-
| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes |
64-
+----------------+--------------+-----------+------------+-----------------+
65-
| 2.3 | 2.2.2 | 2002-2003 | PSF | yes |
66-
+----------------+--------------+-----------+------------+-----------------+
67-
| 2.3.1 | 2.3 | 2002-2003 | PSF | yes |
68-
+----------------+--------------+-----------+------------+-----------------+
69-
| 2.3.2 | 2.3.1 | 2003 | PSF | yes |
70-
+----------------+--------------+-----------+------------+-----------------+
71-
| 2.3.3 | 2.3.2 | 2003 | PSF | yes |
72-
+----------------+--------------+-----------+------------+-----------------+
73-
| 2.3.4 | 2.3.3 | 2004 | PSF | yes |
74-
+----------------+--------------+-----------+------------+-----------------+
75-
| 2.3.5 | 2.3.4 | 2005 | PSF | yes |
76-
+----------------+--------------+-----------+------------+-----------------+
77-
| 2.4 | 2.3 | 2004 | PSF | yes |
78-
+----------------+--------------+-----------+------------+-----------------+
79-
| 2.4.1 | 2.4 | 2005 | PSF | yes |
80-
+----------------+--------------+-----------+------------+-----------------+
81-
| 2.4.2 | 2.4.1 | 2005 | PSF | yes |
82-
+----------------+--------------+-----------+------------+-----------------+
83-
| 2.4.3 | 2.4.2 | 2006 | PSF | yes |
84-
+----------------+--------------+-----------+------------+-----------------+
85-
| 2.4.4 | 2.4.3 | 2006 | PSF | yes |
86-
+----------------+--------------+-----------+------------+-----------------+
87-
| 2.5 | 2.4 | 2006 | PSF | yes |
88-
+----------------+--------------+-----------+------------+-----------------+
89-
| 2.5.1 | 2.5 | 2007 | PSF | yes |
90-
+----------------+--------------+-----------+------------+-----------------+
34+
+----------------+--------------+------------+------------+-----------------+
35+
| Release | Derived from | Year | Owner | GPL compatible? |
36+
+================+==============+============+============+=================+
37+
| 0.9.0 thru 1.2 | n/a | 1991-1995 | CWI | yes |
38+
+----------------+--------------+------------+------------+-----------------+
39+
| 1.3 thru 1.5.2 | 1.2 | 1995-1999 | CNRI | yes |
40+
+----------------+--------------+------------+------------+-----------------+
41+
| 1.6 | 1.5.2 | 2000 | CNRI | no |
42+
+----------------+--------------+------------+------------+-----------------+
43+
| 2.0 | 1.6 | 2000 | BeOpen.com | no |
44+
+----------------+--------------+------------+------------+-----------------+
45+
| 1.6.1 | 1.6 | 2001 | CNRI | no |
46+
+----------------+--------------+------------+------------+-----------------+
47+
| 2.1 | 2.0+1.6.1 | 2001 | PSF | no |
48+
+----------------+--------------+------------+------------+-----------------+
49+
| 2.0.1 | 2.0+1.6.1 | 2001 | PSF | yes |
50+
+----------------+--------------+------------+------------+-----------------+
51+
| 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes |
52+
+----------------+--------------+------------+------------+-----------------+
53+
| 2.2 | 2.1.1 | 2001 | PSF | yes |
54+
+----------------+--------------+------------+------------+-----------------+
55+
| 2.1.2 | 2.1.1 | 2002 | PSF | yes |
56+
+----------------+--------------+------------+------------+-----------------+
57+
| 2.1.3 | 2.1.2 | 2002 | PSF | yes |
58+
+----------------+--------------+------------+------------+-----------------+
59+
| 2.2.1 | 2.2 | 2002 | PSF | yes |
60+
+----------------+--------------+------------+------------+-----------------+
61+
| 2.2.2 | 2.2.1 | 2002 | PSF | yes |
62+
+----------------+--------------+------------+------------+-----------------+
63+
| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes |
64+
+----------------+--------------+------------+------------+-----------------+
65+
| 2.3 | 2.2.2 | 2002-2003 | PSF | yes |
66+
+----------------+--------------+------------+------------+-----------------+
67+
| 2.3.1 | 2.3 | 2002-2003 | PSF | yes |
68+
+----------------+--------------+------------+------------+-----------------+
69+
| 2.3.2 | 2.3.1 | 2003 | PSF | yes |
70+
+----------------+--------------+------------+------------+-----------------+
71+
| 2.3.3 | 2.3.2 | 2003 | PSF | yes |
72+
+----------------+--------------+------------+------------+-----------------+
73+
| 2.3.4 | 2.3.3 | 2004 | PSF | yes |
74+
+----------------+--------------+------------+------------+-----------------+
75+
| 2.3.5 | 2.3.4 | 2005 | PSF | yes |
76+
+----------------+--------------+------------+------------+-----------------+
77+
| 2.4 | 2.3 | 2004 | PSF | yes |
78+
+----------------+--------------+------------+------------+-----------------+
79+
| 2.4.1 | 2.4 | 2005 | PSF | yes |
80+
+----------------+--------------+------------+------------+-----------------+
81+
| 2.4.2 | 2.4.1 | 2005 | PSF | yes |
82+
+----------------+--------------+------------+------------+-----------------+
83+
| 2.4.3 | 2.4.2 | 2006 | PSF | yes |
84+
+----------------+--------------+------------+------------+-----------------+
85+
| 2.4.4 | 2.4.3 | 2006 | PSF | yes |
86+
+----------------+--------------+------------+------------+-----------------+
87+
| 2.5 | 2.4 | 2006 | PSF | yes |
88+
+----------------+--------------+------------+------------+-----------------+
89+
| 2.5.1 | 2.5 | 2007 | PSF | yes |
90+
+----------------+--------------+------------+------------+-----------------+
91+
| 2.6 | 2.5 | unreleased | PSF | yes |
92+
+----------------+--------------+------------+------------+-----------------+
93+
| 3.0 | 2.6 | 2007 | PSF | yes |
94+
+----------------+--------------+------------+------------+-----------------+
9195

9296
.. note::
9397

0 commit comments

Comments
 (0)