summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2003-04-26 00:52:30 (GMT)
committerFred Drake <fdrake@acm.org>2003-04-26 00:52:30 (GMT)
commit2f36b3e2050dee0d622086f12ebb3502c46c54a1 (patch)
tree967a6776b57712fceb2fb580517ec750baefd04c
parentecf0f025180fc0a2df6eb638f4efeab7fb756ac9 (diff)
downloadcpython-2f36b3e2050dee0d622086f12ebb3502c46c54a1.zip
cpython-2f36b3e2050dee0d622086f12ebb3502c46c54a1.tar.gz
cpython-2f36b3e2050dee0d622086f12ebb3502c46c54a1.tar.bz2
Version updates for Python 2.3.
-rw-r--r--Doc/texinputs/boilerplate.tex2
-rw-r--r--Doc/texinputs/license.tex9
2 files changed, 7 insertions, 4 deletions
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index 1da0c68..d4e43b4 100644
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -7,5 +7,5 @@
\date{\today} % XXX update before final release!
\release{2.3} % software release, not documentation
-\setreleaseinfo{b1} % empty for final release
+\setreleaseinfo{b1+} % empty for final release
\setshortversion{2.3} % major.minor only for software
diff --git a/Doc/texinputs/license.tex b/Doc/texinputs/license.tex
index 3aeb68c..a541c29 100644
--- a/Doc/texinputs/license.tex
+++ b/Doc/texinputs/license.tex
@@ -24,7 +24,8 @@ All Python releases are Open Source (see
Historically, most, but not all, Python releases have also been
GPL-compatible; the table below summarizes the various releases.
-\begin{tablev}{c|c|c|c|c}{textrm}{Release}{Derived from}{Year}{Owner}{GPL compatible?}
+\begin{tablev}{c|c|c|c|c}{textrm}%
+ {Release}{Derived from}{Year}{Owner}{GPL compatible?}
\linev{0.9.0 thru 1.2}{n/a}{1991-1995}{CWI}{yes}
\linev{1.3 thru 1.5.2}{1.2}{1995-1999}{CNRI}{yes}
\linev{1.6}{1.5.2}{2000}{CNRI}{no}
@@ -37,6 +38,8 @@ GPL-compatible; the table below summarizes the various releases.
\linev{2.1.2}{2.1.1}{2002}{PSF}{yes}
\linev{2.1.3}{2.1.2}{2002}{PSF}{yes}
\linev{2.2.1}{2.2}{2002}{PSF}{yes}
+ \linev{2.2.2}{2.2.1}{2002}{PSF}{yes}
+ \linev{2.3}{2.2.2}{2002-2003}{PSF}{yes}
\end{tablev}
\note{GPL-compatible doesn't mean that we're distributing
@@ -51,7 +54,7 @@ direction to make these releases possible.
\section{Terms and conditions for accessing or otherwise using Python}
-\centerline{\strong{PSF LICENSE AGREEMENT FOR PYTHON 2.3}}
+\centerline{\strong{PSF LICENSE AGREEMENT FOR PYTHON \version}}
\begin{enumerate}
\item
@@ -67,7 +70,7 @@ license to reproduce, analyze, test, perform and/or display publicly,
prepare derivative works, distribute, and otherwise use Python
\version{} alone or in any derivative version, provided, however, that
PSF's License Agreement and PSF's notice of copyright, i.e.,
-``Copyright \copyright{} 2001, 2002 Python Software Foundation; All
+``Copyright \copyright{} 2001-2003 Python Software Foundation; All
Rights Reserved'' are retained in Python \version{} alone or in any
derivative version prepared by Licensee.