[Python-checkins] CVS: python/dist/src/Doc/texinputs boilerplate.tex,1.62,1.62.2.1 license.tex,1.1,1.1.6.1 python.sty,1.78,1.78.2.1
Tim Peters
tim_one@users.sourceforge.net
Tue, 17 Jul 2001 21:13:58 -0700
Update of /cvsroot/python/python/dist/src/Doc/texinputs
In directory usw-pr-cvs1:/tmp/cvs-serv20213/descr/dist/src/Doc/texinputs
Modified Files:
Tag: descr-branch
boilerplate.tex license.tex python.sty
Log Message:
2.2a1 release: merge of trunk date2001-07-17a -> trunk date2001-07-17b.
Index: boilerplate.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/boilerplate.tex,v
retrieving revision 1.62
retrieving revision 1.62.2.1
diff -C2 -r1.62 -r1.62.2.1
*** boilerplate.tex 2001/07/14 02:11:17 1.62
--- boilerplate.tex 2001/07/18 04:13:56 1.62.2.1
***************
*** 8,11 ****
\date{\today} % XXX update before release!
\release{2.2} % software release, not documentation
! \setreleaseinfo{a0} % empty for final release
\setshortversion{2.2} % major.minor only for software
--- 8,11 ----
\date{\today} % XXX update before release!
\release{2.2} % software release, not documentation
! \setreleaseinfo{a1} % empty for final release
\setshortversion{2.2} % major.minor only for software
Index: license.tex
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/license.tex,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -C2 -r1.1 -r1.1.6.1
*** license.tex 2001/06/20 21:34:35 1.1
--- license.tex 2001/07/18 04:13:56 1.1.6.1
***************
*** 2,33 ****
Python was created in the early 1990s by Guido van Rossum at Stichting
! Mathematisch Centrum (CWI) in the Netherlands as a successor of a
! language called ABC. Guido is Python's principal author, although it
! includes many contributions from others. The last version released
! from CWI was Python 1.2. In 1995, Guido continued his work on Python
! at the Corporation for National Research Initiatives (CNRI) in Reston,
! Virginia where he released several versions of the software. Python
! 1.6 was the last of the versions released by CNRI. In 2000, Guido and
! the Python core development team moved to BeOpen.com to form the
! BeOpen PythonLabs team. Python 2.0 was the first and only release
! from BeOpen.com.
!
! Following the release of Python 1.6, and after Guido van Rossum left
! CNRI to work with commercial software developers, it became clear that
! the ability to use Python with software available under the GNU Public
! License (GPL) was very desirable. CNRI and the Free Software
! Foundation (FSF) interacted to develop enabling wording changes to the
! Python license. Python 1.6.1 is essentially the same as Python 1.6,
! with a few minor bug fixes, and with a different license that enables
! later versions to be GPL-compatible. Python 2.0.1 is a derivative work
! of Python 1.6.1, as well as of Python 2.0.
!
! After Python 2.0 was released by BeOpen.com, Guido van Rossum and the
! other PythonLabs developers joined Digital Creations. All
! intellectual property added from this point on, including Python
! 2.0.1 and its alpha and beta releases, is owned by the Python Software
! Foundation (PSF), a non-profit modeled after the Apache Software
! Foundation. See \url{http://www.python.org/psf/} for more information
! about the PSF.
Thanks to the many outside volunteers who have worked under Guido's
--- 2,45 ----
Python was created in the early 1990s by Guido van Rossum at Stichting
! Mathematisch Centrum (CWI, see \url{http://www.cwi.nl/}) in the Netherlands
! as a successor of a language called ABC. Guido remains Python's
! principal author, although it includes many contributions from others.
!
! In 1995, Guido continued his work on Python at the Corporation for
! National Research Initiatives (CNRI, see \url{http://www.cnri.reston.va.us/})
! in Reston, Virginia where he released several versions of the
! software.
!
! In May 2000, Guido and the Python core development team moved to
! BeOpen.com to form the BeOpen PythonLabs team. In October of the same
! year, the PythonLabs team moved to Digital Creations (see
! \url{http://www.digicool.com/}). In 2001, the Python Software
! Foundation (PSF, see \url{http://www.python.org/psf/}) was formed, a
! non-profit organization created specifically to own Python-related
! Intellectual Property. Digital Creations is a sponsoring member of
! the PSF.
!
! All Python releases are Open Source (see
! \url{http://www.opensource.org/} for the Open Source Definition).
! 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?}
! \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}
! \linev{2.0}{1.6}{2000}{BeOpen.com}{no}
! \linev{1.6.1}{1.6}{2001}{CNRI}{no}
! \linev{2.1}{2.0+1.6.1}{2001}{PSF}{no}
! \linev{2.0.1}{2.0+1.6.1}{2001}{PSF}{yes}
! \linev{2.1.1}{2.1+2.0.1}{2001}{PSF}{yes}
! \linev{2.2}{2.1.1}{2001}{PSF}{yes}
! \end{tablev}
!
! \strong{Note:} GPL-compatible doesn't mean that we're distributing
! Python under the GPL. All Python licenses, unlike the GPL, let you
! distribute a modified version without making your changes open source.
! The GPL-compatible licenses make it possible to combine Python with
! other software that is released under the GPL; the others don't.
Thanks to the many outside volunteers who have worked under Guido's
***************
*** 37,41 ****
\section{Terms and conditions for accessing or otherwise using Python}
! \centerline{\strong{PSF LICENSE AGREEMENT}}
\begin{enumerate}
--- 49,53 ----
\section{Terms and conditions for accessing or otherwise using Python}
! \centerline{\strong{PSF LICENSE AGREEMENT FOR PYTHON 2.2}}
\begin{enumerate}
***************
*** 97,101 ****
! \centerline{\strong{BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0}}
\centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}}
--- 109,113 ----
! \centerline{\strong{BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0}}
\centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}}
***************
*** 155,159 ****
! \centerline{\strong{CNRI OPEN SOURCE GPL-COMPATIBLE LICENSE AGREEMENT}}
\begin{enumerate}
--- 167,171 ----
! \centerline{\strong{CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1}}
\begin{enumerate}
***************
*** 237,241 ****
! \centerline{\strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER}}
Copyright \copyright{} 1991 - 1995, Stichting Mathematisch Centrum
--- 249,253 ----
! \centerline{\strong{CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2}}
Copyright \copyright{} 1991 - 1995, Stichting Mathematisch Centrum
Index: python.sty
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/texinputs/python.sty,v
retrieving revision 1.78
retrieving revision 1.78.2.1
diff -C2 -r1.78 -r1.78.2.1
*** python.sty 2001/07/06 22:44:48 1.78
--- python.sty 2001/07/18 04:13:56 1.78.2.1
***************
*** 979,982 ****
--- 979,1003 ----
}
+ \newenvironment{tablev}[7]{%
+ \begin{center}%
+ \def\linev##1##2##3##4##5{\csname#2\endcsname{##1}&##2&##3&##4&##5\\}%
+ \begin{tabular}{#1}\strong{#3}&\strong{#4}&\strong{#5}&\strong{#6}&\strong{#7} \\%
+ \hline%
+ }{%
+ \end{tabular}%
+ \end{center}%
+ }
+
+ \newenvironment{longtablev}[7]{%
+ \begin{center}%
+ \def\linev##1##2##3##4##5{\csname#2\endcsname{##1}&##2&##3&##4&##5\\}%
+ \begin{longtable}[c]{#1}\strong{#3}&\strong{#4}&\strong{#5}&\strong{#6}&\strong{#7}%
+ \\%
+ \hline\endhead%
+ }{%
+ \end{longtable}%
+ \end{center}%
+ }
+
% Cross-referencing (AMK, new impl. FLD)
% Sample usage: