Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge 3.5 (doc)

This commit is contained in:
Victor Stinner 2016-01-21 08:58:44 +01:00
parent 2b0b5ac5a0 d99cd333fe
commit 875dde4387
2 changed files with 159 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Doc/license.rst
View File

@ -73,13 +73,16 @@ 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 .. parsed-literal::
1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and
the Individual or Organization ("Licensee") accessing and otherwise using Python the Individual or Organization ("Licensee") accessing and otherwise using Python
|release| software in source or binary form and its associated documentation. |release| software in source or binary form and its associated documentation.
#. Subject to the terms and conditions of this License Agreement, PSF hereby 2. Subject to the terms and conditions of this License Agreement, PSF hereby
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
analyze, test, perform and/or display publicly, prepare derivative works, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative distribute, and otherwise use Python |release| alone or in any derivative
@ -88,68 +91,70 @@ Terms and conditions for accessing or otherwise using Python
Reserved" are retained in Python |release| alone or in any derivative version Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee. prepared by Licensee.
#. In the event Licensee prepares a derivative work that is based on or 3. In the event Licensee prepares a derivative work that is based on or
incorporates Python |release| or any part thereof, and wants to make the incorporates Python |release| or any part thereof, and wants to make the
derivative work available to others as provided herein, then Licensee hereby 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 agrees to include in any such work a brief summary of the changes made to Python
|release|. |release|.
#. PSF is making Python |release| available to Licensee on an "AS IS" basis. 4. PSF is making Python |release| available to Licensee on an "AS IS" basis.
PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
USE OF PYTHON |release| WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. USE OF PYTHON |release| WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
#. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON |release| 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 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON |release|, OR ANY DERIVATIVE MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON |release|, OR ANY DERIVATIVE
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
#. This License Agreement will automatically terminate upon a material breach of 6. This License Agreement will automatically terminate upon a material breach of
its terms and conditions. its terms and conditions.
#. Nothing in this License Agreement shall be deemed to create any relationship 7. Nothing in this License Agreement shall be deemed to create any relationship
of agency, partnership, or joint venture between PSF and Licensee. This License 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 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 trademark sense to endorse or promote products or services of Licensee, or any
third party. third party.
#. By copying, installing or otherwise using Python |release|, Licensee agrees 8. By copying, installing or otherwise using Python |release|, Licensee agrees
to be bound by the terms and conditions of this License Agreement. to be bound by the terms and conditions of this License Agreement.
.. centered:: BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
-------------------------------------------
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
.. centered:: BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 .. parsed-literal::
#. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at 1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an office at
160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization 160 Saratoga Avenue, Santa Clara, CA 95051, and the Individual or Organization
("Licensee") accessing and otherwise using this software in source or binary ("Licensee") accessing and otherwise using this software in source or binary
form and its associated documentation ("the Software"). form and its associated documentation ("the Software").
#. Subject to the terms and conditions of this BeOpen Python License Agreement, 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 hereby grants Licensee a non-exclusive, royalty-free, world-wide license
to reproduce, analyze, test, perform and/or display publicly, prepare derivative to reproduce, analyze, test, perform and/or display publicly, prepare derivative
works, distribute, and otherwise use the Software alone or in any 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 version, provided, however, that the BeOpen Python License is retained in the
Software, alone or in any derivative version prepared by Licensee. Software, alone or in any derivative version prepared by Licensee.
#. BeOpen is making the Software available to Licensee on an "AS IS" basis. 3. 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 BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF
EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION OR EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND DISCLAIMS ANY REPRESENTATION OR
WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. USE OF THE SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
#. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE SOFTWARE FOR 4. 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, ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF USING,
MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY DERIVATIVE THEREOF, EVEN IF
ADVISED OF THE POSSIBILITY THEREOF. ADVISED OF THE POSSIBILITY THEREOF.
#. This License Agreement will automatically terminate upon a material breach of 5. This License Agreement will automatically terminate upon a material breach of
its terms and conditions. its terms and conditions.
#. This License Agreement shall be governed by and interpreted in all respects 6. 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. 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 Nothing in this License Agreement shall be deemed to create any relationship of
agency, partnership, or joint venture between BeOpen and Licensee. This License agency, partnership, or joint venture between BeOpen and Licensee. This License
@ -159,19 +164,22 @@ Terms and conditions for accessing or otherwise using Python
http://www.pythonlabs.com/logos.html may be used according to the permissions http://www.pythonlabs.com/logos.html may be used according to the permissions
granted on that web page. granted on that web page.
#. By copying, installing or otherwise using the software, Licensee agrees to be 7. By copying, installing or otherwise using the software, Licensee agrees to be
bound by the terms and conditions of this License Agreement. bound by the terms and conditions of this License Agreement.
.. centered:: CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
---------------------------------------
#. This LICENSE AGREEMENT is between the Corporation for National Research .. parsed-literal::
1. This LICENSE AGREEMENT is between the Corporation for National Research
Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191 Initiatives, having an office at 1895 Preston White Drive, Reston, VA 20191
("CNRI"), and the Individual or Organization ("Licensee") accessing and ("CNRI"), and the Individual or Organization ("Licensee") accessing and
otherwise using Python 1.6.1 software in source or binary form and its otherwise using Python 1.6.1 software in source or binary form and its
associated documentation. associated documentation.
#. Subject to the terms and conditions of this License Agreement, CNRI hereby 2. Subject to the terms and conditions of this License Agreement, CNRI hereby
grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
analyze, test, perform and/or display publicly, prepare derivative works, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python 1.6.1 alone or in any derivative version, distribute, and otherwise use Python 1.6.1 alone or in any derivative version,
@ -186,26 +194,26 @@ Terms and conditions for accessing or otherwise using Python
1895.22/1013. This Agreement may also be obtained from a proxy server on the 1895.22/1013. This Agreement may also be obtained from a proxy server on the
Internet using the following URL: http://hdl.handle.net/1895.22/1013." Internet using the following URL: http://hdl.handle.net/1895.22/1013."
#. In the event Licensee prepares a derivative work that is based on or 3. In the event Licensee prepares a derivative work that is based on or
incorporates Python 1.6.1 or any part thereof, and wants to make the derivative 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 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 1.6.1. include in any such work a brief summary of the changes made to Python 1.6.1.
#. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI 4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" basis. CNRI
MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE,
BUT NOT LIMITATION, CNRI MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY 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 OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. PYTHON 1.6.1 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
#. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR 5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON 1.6.1 FOR
ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF
MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, OR ANY DERIVATIVE
THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
#. This License Agreement will automatically terminate upon a material breach of 6. This License Agreement will automatically terminate upon a material breach of
its terms and conditions. its terms and conditions.
#. This License Agreement shall be governed by the federal intellectual property 7. This License Agreement shall be governed by the federal intellectual property
law of the United States, including without limitation the federal copyright law of the United States, including without limitation the federal copyright
law, and, to the extent such U.S. federal law does not apply, by the law of the law, and, to the extent such U.S. federal law does not apply, by the law of the
Commonwealth of Virginia, excluding Virginia's conflict of law provisions. Commonwealth of Virginia, excluding Virginia's conflict of law provisions.
@ -220,15 +228,15 @@ Terms and conditions for accessing or otherwise using Python
sense to endorse or promote products or services of Licensee, or any third sense to endorse or promote products or services of Licensee, or any third
party. party.
#. By clicking on the "ACCEPT" button where indicated, or by copying, installing 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 or otherwise using Python 1.6.1, Licensee agrees to be bound by the terms and
conditions of this License Agreement. conditions of this License Agreement.
.. centered:: ACCEPT CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
--------------------------------------------------
.. parsed-literal::
.. centered:: CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
Copyright © 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The Copyright © 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, The
Netherlands. All rights reserved. Netherlands. All rights reserved.
@ -946,5 +954,3 @@ library unless the build is configured ``--with-system-libmpdec``::
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 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.

1
Misc/ACKS
View File

@ -1073,6 +1073,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