Commits

Fred Drake committed be42ce2

Adjust so that the copyright statements remain at the front but all the long
licenses move to the back, so as not to annoy as many readers.

  • Participants
  • Parent commits ed3745d
  • Branches 2.0

Comments (0)

Files changed (7)

File Doc/api/api.tex

 \chapter{Reporting Bugs}
 \input{reportingbugs}
 
+\chapter{History and License}
+\input{license}
+
 \input{api.ind}			% Index -- must be last
 
 \end{document}

File Doc/ext/ext.tex

 \chapter{Reporting Bugs}
 \input{reportingbugs}
 
+\chapter{History and License}
+\input{license}
+
 \end{document}

File Doc/lib/lib.tex

 
 \appendix
 \input{libundoc}
+
 \chapter{Reporting Bugs}
 \input{reportingbugs}
 
+\chapter{History and License}
+\input{license}
+
 %
 %  The ugly "%begin{latexonly}" pseudo-environments are really just to
 %  keep LaTeX2HTML quiet during the \renewcommand{} macros; they're

File Doc/mac/mac.tex

 
 \input{undoc}                           % Undocumented Modules
 
+\appendix
+\chapter{History and License}
+\input{license}
+
 %
 %  The ugly "%begin{latexonly}" pseudo-environments are really just to
 %  keep LaTeX2HTML quiet during the \renewcommand{} macros; they're

File Doc/ref/ref.tex

 \input{ref7}		% Compound statements
 \input{ref8}		% Top-level components
 
+\appendix
+\chapter{History and License}
+\input{license}
+
 \input{ref.ind}
 
 \end{document}

File Doc/texinputs/copyright.tex

-\centerline{\strong{BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0}}
+Copyright \copyright{} 2001 Python Software Foundation.
+All rights reserved.
 
-\centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}}
+Copyright \copyright{} 2000 BeOpen.com.
+All rights reserved.
 
-\begin{enumerate}
+Copyright \copyright{} 1995-2000 Corporation for National Research Initiatives.
+All rights reserved.
 
-\item
-This LICENSE AGREEMENT is between BeOpen.com (``BeOpen''), having an
-office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
-Individual or Organization (``Licensee'') accessing and otherwise
-using this software in source or binary form and its associated
-documentation (``the Software'').
+Copyright \copyright{} 1991-1995 Stichting Mathematisch Centrum.
+All rights reserved.
 
-\item
-Subject to the terms and conditions of this BeOpen Python License
-Agreement, BeOpen hereby grants Licensee a non-exclusive,
-royalty-free, world-wide license to reproduce, analyze, test, perform
-and/or display publicly, prepare derivative works, distribute, and
-otherwise use the Software alone or in any derivative version,
-provided, however, that the BeOpen Python License is retained in the
-Software, alone or in any derivative version prepared by Licensee.
-
-\item
-BeOpen is making the Software available to Licensee on an ``AS IS''
-basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
-DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
-INFRINGE ANY THIRD PARTY RIGHTS.
-
-\item
-BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
-SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
-AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-\item
-This License Agreement will automatically terminate upon a material
-breach of its terms and conditions.
-
-\item
-This License Agreement shall be governed by and interpreted in all
-respects by the law of the State of California, excluding conflict of
-law provisions.  Nothing in this License Agreement shall be deemed to
-create any relationship of agency, partnership, or joint venture
-between BeOpen and Licensee.  This License Agreement does not grant
-permission to use BeOpen trademarks or trade names in a trademark
-sense to endorse or promote products or services of Licensee, or any
-third party.  As an exception, the ``BeOpen Python'' logos available
-at http://www.pythonlabs.com/logos.html may be used according to the
-permissions granted on that web page.
-
-\item
-By copying, installing or otherwise using the software, Licensee
-agrees to be bound by the terms and conditions of this License
-Agreement.
-\end{enumerate}
-
-
-\centerline{\strong{CNRI OPEN SOURCE 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
-be located on the Internet using the following unique, persistent
-identifier (known as a handle): 1895.22/1012.  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}.
-
-
-\centerline{\strong{CWI PERMISSIONS STATEMENT AND DISCLAIMER}}
-
-Copyright \copyright{} 1991 - 1995, Stichting Mathematisch Centrum
-Amsterdam, The Netherlands.  All rights reserved.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Stichting Mathematisch
-Centrum or CWI not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
-FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+See the end of this document for complete license and permissions
+information.

File Doc/tut/tut.tex

 be useful.
 
 
+\chapter{History and License}
+\input{license}
+
 \end{document}