Skip to content

C
cpython
Commit 047ddfb6 authored by Victor Stinner's avatar Victor Stinner
Browse files
Options

Issue #26106: doc: Move text of licenses to parsed literal block 

This change helps to ignore text of PSF, BEOPEN.com and CNRI licenses when
translating the documentation. Patch written by Julien Palard who is
translating Python 3.5 doc to french. Text of other licenses already used
preformatted format.
parent 64ea192b
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 177 deletions
Doc/license.rst
View file @ 047ddfb6
...@@ -73,181 +73,189 @@ Terms and conditions for accessing or otherwise using Python ...@@ -73,181 +73,189 @@ Terms and conditions for accessing or otherwise using Python
============================================================ ============================================================
.. centered:: PSF LICENSE AGREEMENT FOR PYTHON |release| PSF LICENSE AGREEMENT FOR PYTHON |release|
------------------------------------------
#. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
the Individual or Organization ("Licensee") accessing and otherwise using Python .. parsed-literal::
|release| software in source or binary form and its associated documentation.
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
#. Subject to the terms and conditions of this License Agreement, PSF hereby the Individual or Organization ("Licensee") accessing and otherwise using Python
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, |release| software in source or binary form and its associated documentation.
analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative 2. Subject to the terms and conditions of this License Agreement, PSF hereby
version, provided, however, that PSF's License Agreement and PSF's notice of grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights analyze, test, perform and/or display publicly, prepare derivative works,
Reserved" are retained in Python |release| alone or in any derivative version distribute, and otherwise use Python |release| alone or in any derivative
prepared by Licensee. version, provided, however, that PSF's License Agreement and PSF's notice of
copyright, i.e., "Copyright © 2001-2016 Python Software Foundation; All Rights
#. In the event Licensee prepares a derivative work that is based on or Reserved" are retained in Python |release| alone or in any derivative version
incorporates Python |release| or any part thereof, and wants to make the prepared by Licensee.
derivative work available to others as provided herein, then Licensee hereby
agrees to include in any such work a brief summary of the changes made to Python 3. In the event Licensee prepares a derivative work that is based on or
|release|. incorporates Python |release| or any part thereof, and wants to make the
derivative work available to others as provided herein, then Licensee hereby
#. PSF is making Python |release| available to Licensee on an "AS IS" basis. agrees to include in any such work a brief summary of the changes made to Python
PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF |release|.
EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 4. PSF is making Python |release| available to Licensee on an "AS IS" basis.
USE OF PYTHON |release| WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
#. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON |release| WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USE OF PYTHON |release| WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON |release|, OR ANY DERIVATIVE
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON |release|
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
#. This License Agreement will automatically terminate upon a material breach of MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON |release|, OR ANY DERIVATIVE
its terms and conditions. THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
#. Nothing in this License Agreement shall be deemed to create any relationship 6. This License Agreement will automatically terminate upon a material breach of
of agency, partnership, or joint venture between PSF and Licensee. This License its terms and conditions.
Agreement does not grant permission to use PSF trademarks or trade name in a
trademark sense to endorse or promote products or services of Licensee, or any 7. Nothing in this License Agreement shall be deemed to create any relationship
third party. of agency, partnership, or joint venture between PSF and Licensee. This License
Agreement does not grant permission to use PSF trademarks or trade name in a
#. By copying, installing or otherwise using Python |release|, Licensee agrees trademark sense to endorse or promote products or services of Licensee, or any
to be bound by the terms and conditions of this License Agreement. third party.
8. By copying, installing or otherwise using Python |release|, Licensee agrees
.. centered:: BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 to be bound by the terms and conditions of this License Agreement.
.. centered:: BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
-------------------------------------------
#. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at
160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
("Licensee") accessing and otherwise using this software in source or binary
form and its associated documentation ("the Software"). .. parsed-literal::
#. Subject to the terms and conditions of this BeOpen Python License Agreement, 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at
BeOpen hereby grants Licensee a non-exclusive, royalty-free, world-wide license 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization
to reproduce, analyze, test, perform and/or display publicly, prepare derivative ("Licensee") accessing and otherwise using this software in source or binary
works, distribute, and otherwise use the Software alone or in any derivative form and its associated documentation ("the Software").
version, provided, however, that the BeOpen Python License is retained in the
Software, alone or in any derivative version prepared by Licensee. 2. Subject to the terms and conditions of this BeOpen Python License Agreement,
BeOpen hereby grants Licensee a non-exclusive, royalty-free, world-wide license
#. BeOpen is making the Software available to Licensee on an "AS IS" basis. to reproduce, analyze, test, perform and/or display publicly, prepare derivative
BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF works, distribute, and otherwise use the Software alone or in any derivative
EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION OR version, provided, however, that the BeOpen Python License is retained in the
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE Software, alone or in any derivative version prepared by Licensee.
USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
3. BeOpen is making the Software available to Licensee on an "AS IS" basis.
#. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING, EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
ADVISED OF THE POSSIBILITY THEREOF. USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
#. This License Agreement will automatically terminate upon a material breach of 4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR
its terms and conditions. ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING,
MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF
#. This License Agreement shall be governed by and interpreted in all respects ADVISED OF THE POSSIBILITY THEREOF.
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 5. This License Agreement will automatically terminate upon a material breach of
agency, partnership, or joint venture between BeOpen and Licensee. This License its terms and conditions.
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 6. This License Agreement shall be governed by and interpreted in all respects
third party. As an exception, the "BeOpen Python" logos available at by the law of the State of California, excluding conflict of law provisions.
http://www.pythonlabs.com/logos.html may be used according to the permissions Nothing in this License Agreement shall be deemed to create any relationship of
granted on that web page. 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
#. By copying, installing or otherwise using the software, Licensee agrees to be trademark sense to endorse or promote products or services of Licensee, or any
bound by the terms and conditions of this License Agreement. 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.
.. centered:: CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
7. By copying, installing or otherwise using the software, Licensee agrees to be
#. This LICENSE AGREEMENT is between the Corporation for National Research bound by the terms and conditions of this License Agreement.
Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
("CNRI"), and the Individual or Organization ("Licensee") accessing and
otherwise using Python 1.6.1 software in source or binary form and its CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
associated documentation. ---------------------------------------
#. Subject to the terms and conditions of this License Agreement, CNRI hereby .. parsed-literal::
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
analyze, test, perform and/or display publicly, prepare derivative works, 1. This LICENSE AGREEMENT is between the Corporation for National Research
distribute, and otherwise use Python 1.6.1 alone or in any derivative version, Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
provided, however, that CNRI's License Agreement and CNRI's notice of copyright, ("CNRI"), and the Individual or Organization ("Licensee") accessing and
i.e., "Copyright © 1995-2001 Corporation for National Research Initiatives; All otherwise using Python 1.6.1 software in source or binary form and its
Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version associated documentation.
prepared by Licensee. Alternately, in lieu of CNRI's License Agreement,
Licensee may substitute the following text (omitting the quotes): "Python 1.6.1 2. Subject to the terms and conditions of this License Agreement, CNRI hereby
is made available subject to the terms and conditions in CNRI's License grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
Agreement. This Agreement together with Python 1.6.1 may be located on the analyze, test, perform and/or display publicly, prepare derivative works,
Internet using the following unique, persistent identifier (known as a handle): distribute, and otherwise use Python 1.6.1 alone or in any derivative version,
1895.22/1013. This Agreement may also be obtained from a proxy server on the provided, however, that CNRI's License Agreement and CNRI's notice of copyright,
Internet using the following URL: http://hdl.handle.net/1895.22/1013." i.e., "Copyright © 1995-2001 Corporation for National Research Initiatives; All
Rights Reserved" are retained in Python 1.6.1 alone or in any derivative version
#. In the event Licensee prepares a derivative work that is based on or prepared by Licensee. Alternately, in lieu of CNRI's License Agreement,
incorporates Python 1.6.1 or any part thereof, and wants to make the derivative Licensee may substitute the following text (omitting the quotes): "Python 1.6.1
work available to others as provided herein, then Licensee hereby agrees to is made available subject to the terms and conditions in CNRI's License
include in any such work a brief summary of the changes made to Python 1.6.1. 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):
#. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI 1895.22/1013. This Agreement may also be obtained from a proxy server on the
MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, Internet using the following URL: http://hdl.handle.net/1895.22/1013."
BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF 3. In the event Licensee prepares a derivative work that is based on or
PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. incorporates Python 1.6.1 or any part thereof, and wants to make the derivative
work available to others as provided herein, then Licensee hereby agrees to
#. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR include in any such work a brief summary of the changes made to Python 1.6.1.
ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
#. This License Agreement will automatically terminate upon a material breach of OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
its terms and conditions. PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
#. This License Agreement shall be governed by the federal intellectual property 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR
law of the United States, including without limitation the federal copyright ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
law, and, to the extent such U.S. federal law does not apply, by the law of the MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE
Commonwealth of Virginia, excluding Virginia's conflict of law provisions. THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
Notwithstanding the foregoing, with regard to derivative works based on Python
1.6.1 that incorporate non-separable material that was previously distributed 6. This License Agreement will automatically terminate upon a material breach of
under the GNU General Public License (GPL), the law of the Commonwealth of its terms and conditions.
Virginia shall govern this License Agreement only as to issues arising under or
with respect to Paragraphs 4, 5, and 7 of this License Agreement. Nothing in 7. This License Agreement shall be governed by the federal intellectual property
this License Agreement shall be deemed to create any relationship of agency, law of the United States, including without limitation the federal copyright
partnership, or joint venture between CNRI and Licensee. This License Agreement law, and, to the extent such U.S. federal law does not apply, by the law of the
does not grant permission to use CNRI trademarks or trade name in a trademark Commonwealth of Virginia, excluding Virginia's conflict of law provisions.
sense to endorse or promote products or services of Licensee, or any third Notwithstanding the foregoing, with regard to derivative works based on Python
party. 1.6.1 that incorporate non-separable material that was previously distributed
under the GNU General Public License (GPL), the law of the Commonwealth of
#. By clicking on the "ACCEPT" button where indicated, or by copying, installing Virginia shall govern this License Agreement only as to issues arising under or
or otherwise using Python 1.6.1, Licensee agrees to be bound by the terms and with respect to Paragraphs 4, 5, and 7 of this License Agreement. Nothing in
conditions of this License Agreement. this License Agreement shall be deemed to create any relationship of agency,
partnership, or joint venture between CNRI and Licensee. This License Agreement
does not grant permission to use CNRI trademarks or trade name in a trademark
.. centered:: ACCEPT sense to endorse or promote products or services of Licensee, or any third
party.
.. centered:: CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 8. By clicking on the "ACCEPT" button where indicated, or by copying, installing
or otherwise using Python 1.6.1, Licensee agrees to be bound by the terms and
Copyright © 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The conditions of this License Agreement.
Netherlands. All rights reserved.
Permission to use, copy, modify, and distribute this software and its CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
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 .. parsed-literal::
the name of Stichting Mathematisch Centrum or CWI not be used in advertising or
publicity pertaining to distribution of the software without specific, written Copyright © 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The
prior permission. Netherlands. All rights reserved.
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS Permission to use, copy, modify, and distribute this software and its
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO documentation for any purpose and without fee is hereby granted, provided that
EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE FOR ANY SPECIAL, INDIRECT the above copyright notice appear in all copies and that both that copyright
OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, notice and this permission notice appear in supporting documentation, and that
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS the name of Stichting Mathematisch Centrum or CWI not be used in advertising or
ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS publicity pertaining to distribution of the software without specific, written
SOFTWARE. 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.
Licenses and Acknowledgements for Incorporated Software Licenses and Acknowledgements for Incorporated Software
...@@ -339,8 +347,6 @@ Project, http://www.wide.ad.jp/. :: ...@@ -339,8 +347,6 @@ Project, http://www.wide.ad.jp/. ::
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN GAI_ANY WAY LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN GAI_ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
Floating point exception control Floating point exception control
-------------------------------- --------------------------------
......
Misc/ACKS
View file @ 047ddfb6
...@@ -1018,6 +1018,7 @@ Russel Owen ...@@ -1018,6 +1018,7 @@ Russel Owen
Joonas Paalasmaa Joonas Paalasmaa
Martin Packman Martin Packman
Shriphani Palakodety Shriphani Palakodety
Julien Palard
Ondrej Palkovsky Ondrej Palkovsky
Mike Pall Mike Pall
Todd R. Palmer Todd R. Palmer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7