diff options
author | Fred Drake <fdrake@acm.org> | 2001-06-21 18:52:50 (GMT) |
---|---|---|
committer | Fred Drake <fdrake@acm.org> | 2001-06-21 18:52:50 (GMT) |
commit | 257f7d07061d0f640a45a83f004e3869136659e8 (patch) | |
tree | 4aff6deab0a2a098e8b11ca97bcc218d8204a9c7 | |
parent | a952658a161045618ada4b37d657c1813f2008b8 (diff) | |
download | cpython-257f7d07061d0f640a45a83f004e3869136659e8.zip cpython-257f7d07061d0f640a45a83f004e3869136659e8.tar.gz cpython-257f7d07061d0f640a45a83f004e3869136659e8.tar.bz2 |
Adjust the documents so that the copyright is at the front of the documents
and the license statements are at the end. This is less annoying to readers.
-rw-r--r-- | Doc/Makefile.deps | 1 | ||||
-rw-r--r-- | Doc/api/api.tex | 3 | ||||
-rw-r--r-- | Doc/ext/ext.tex | 3 | ||||
-rw-r--r-- | Doc/mac/mac.tex | 4 | ||||
-rw-r--r-- | Doc/ref/ref.tex | 4 | ||||
-rw-r--r-- | Doc/texinputs/copyright.tex | 98 | ||||
-rw-r--r-- | Doc/tut/tut.tex | 3 |
7 files changed, 20 insertions, 96 deletions
diff --git a/Doc/Makefile.deps b/Doc/Makefile.deps index c4107ad..987beea 100644 --- a/Doc/Makefile.deps +++ b/Doc/Makefile.deps @@ -5,6 +5,7 @@ COMMONSTYLES= texinputs/python.sty \ texinputs/python.ist COMMONTEX= texinputs/copyright.tex \ + texinputs/license.tex \ texinputs/boilerplate.tex MANSTYLES= texinputs/fncychap.sty \ diff --git a/Doc/api/api.tex b/Doc/api/api.tex index 6485878..3fef843 100644 --- a/Doc/api/api.tex +++ b/Doc/api/api.tex @@ -5270,6 +5270,9 @@ new_object(PyObject *unused, PyObject *args) \chapter{Reporting Bugs} \input{reportingbugs} +\chapter{History and License} +\input{license} + \input{api.ind} % Index -- must be last \end{document} diff --git a/Doc/ext/ext.tex b/Doc/ext/ext.tex index 446802f..bbe7efa 100644 --- a/Doc/ext/ext.tex +++ b/Doc/ext/ext.tex @@ -2578,4 +2578,7 @@ corresponds to the variable of the same name in Python's top-level \chapter{Reporting Bugs} \input{reportingbugs} +\chapter{History and License} +\input{license} + \end{document} diff --git a/Doc/mac/mac.tex b/Doc/mac/mac.tex index 2edd857..dab6383 100644 --- a/Doc/mac/mac.tex +++ b/Doc/mac/mac.tex @@ -71,6 +71,10 @@ documented here: \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 diff --git a/Doc/ref/ref.tex b/Doc/ref/ref.tex index 0f65ddb..8259b80 100644 --- a/Doc/ref/ref.tex +++ b/Doc/ref/ref.tex @@ -61,6 +61,10 @@ C/\Cpp{} programmers in detail. \appendix \input{refa1} % Future statements and nested scopes +\appendix +\chapter{History and License} +\input{license} + \input{ref.ind} \end{document} diff --git a/Doc/texinputs/copyright.tex b/Doc/texinputs/copyright.tex index 7b45dce..f76045f 100644 --- a/Doc/texinputs/copyright.tex +++ b/Doc/texinputs/copyright.tex @@ -1,4 +1,3 @@ -\begin{small} Copyright \copyright{} 2001 Python Software Foundation. All rights reserved. @@ -11,98 +10,5 @@ All rights reserved. Copyright \copyright{} 1991-1995 Stichting Mathematisch Centrum. All rights reserved. -%%begin{latexonly} -\vskip 4mm -%%end{latexonly} - -\centerline{\strong{BEOPEN.COM TERMS AND CONDITIONS FOR PYTHON 2.0}} - -\centerline{\strong{BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1}} - -\begin{enumerate} - -\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''). - -\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 GPL-COMPATIBLE LICENSE AGREEMENT}} - -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/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/1013}. - - -\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. -\end{small} +See the end of this document for complete license and permissions +information. diff --git a/Doc/tut/tut.tex b/Doc/tut/tut.tex index d59a6bb..5fe1cb7 100644 --- a/Doc/tut/tut.tex +++ b/Doc/tut/tut.tex @@ -4080,4 +4080,7 @@ check (or even suggest) matching parentheses, quotes, etc., would also be useful. +\chapter{History and License} +\input{license} + \end{document} |