summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-03-22 17:00:05 (GMT)
committerFred Drake <fdrake@acm.org>2001-03-22 17:00:05 (GMT)
commit15e07f44424aa79a3a646f13cab16735c50704a0 (patch)
treeae98f37a6673a3c07b2a2d185b52eb16007d2c6f
parente28d8aef2db27e7d86656361b54f64edcbd84906 (diff)
downloadcpython-15e07f44424aa79a3a646f13cab16735c50704a0.zip
cpython-15e07f44424aa79a3a646f13cab16735c50704a0.tar.gz
cpython-15e07f44424aa79a3a646f13cab16735c50704a0.tar.bz2
Update to the current state of the universe.
-rw-r--r--Doc/texinputs/copyright.tex23
1 files changed, 18 insertions, 5 deletions
diff --git a/Doc/texinputs/copyright.tex b/Doc/texinputs/copyright.tex
index ca750b1..72f3bfb 100644
--- a/Doc/texinputs/copyright.tex
+++ b/Doc/texinputs/copyright.tex
@@ -1,3 +1,16 @@
+Copyright \copyright{} 2001 Python Software Foundation.
+All rights reserved.
+
+Copyright \copyright{} 2000 BeOpen.com.
+All rights reserved.
+
+Copyright \copyright{} 1995-2000 Corporation for National Research Initiatives.
+All rights reserved.
+
+Copyright \copyright{} 1991-1995 Stichting Mathematisch Centrum.
+All rights reserved.
+
+
\centerline{\strong{BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0}}
\centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}}
@@ -57,14 +70,14 @@ Agreement.
\end{enumerate}
-\centerline{\strong{CNRI OPEN SOURCE LICENSE AGREEMENT}}
+\centerline{\strong{CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT}}
-Python 1.6 is made available subject to the terms and conditions in
-CNRI's License Agreement. This Agreement together with Python 1.6 may
+Python 1.6.1 is made available subject to the terms and conditions in
+CNRI's License Agreement. This Agreement together with Python 1.6.1 may
be located on the Internet using the following unique, persistent
-identifier (known as a handle): 1895.22/1012. This Agreement may also
+identifier (known as a handle): 1895.22/1013. This Agreement may also
be obtained from a proxy server on the Internet using the following
-URL: \url{http://hdl.handle.net/1895.22/1012}.
+URL: \url{http://hdl.handle.net/1895.22/1013}.
\centerline{\strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER}}