[Python-checkins] CVS: python/dist/src LICENSE,1.15.2.3,1.15.2.4

2002年1月10日 15:32:38 -0800

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv5717
Modified Files:
 Tag: release21-maint
	LICENSE 
Log Message:
The license text needs to refer to 2.1.2, not 2.1.1.
Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.15.2.3
retrieving revision 1.15.2.4
diff -C2 -d -r1.15.2.3 -r1.15.2.4
*** LICENSE	2001年07月13日 17:06:26	1.15.2.3
--- LICENSE	2002年01月10日 23:32:36	1.15.2.4
***************
*** 44,48 ****
 1. This LICENSE AGREEMENT is between the Python Software Foundation
 ("PSF"), and the Individual or Organization ("Licensee") accessing and
! otherwise using Python 2.1.1 software in source or binary form and its
 associated documentation.

--- 44,48 ----
 1. This LICENSE AGREEMENT is between the Python Software Foundation
 ("PSF"), and the Individual or Organization ("Licensee") accessing and
! otherwise using Python 2.1.2 software in source or binary form and its
 associated documentation.

***************
*** 50,75 ****
 hereby grants Licensee a nonexclusive, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly,
! prepare derivative works, distribute, and otherwise use Python 2.1.1
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
 2001 Python Software Foundation; All Rights Reserved" are retained in
! Python 2.1.1 alone or in any derivative version prepared by Licensee.

 3. In the event Licensee prepares a derivative work that is based on
! or incorporates Python 2.1.1 or any part thereof, and wants to make
 the 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 2.1.1.

! 4. PSF is making Python 2.1.1 available to Licensee on an "AS IS"
 basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
! FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1.1 WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.

 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! 2.1.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
! A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1.1,
 OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.

--- 50,75 ----
 hereby grants Licensee a nonexclusive, royalty-free, world-wide
 license to reproduce, analyze, test, perform and/or display publicly,
! prepare derivative works, distribute, and otherwise use Python 2.1.2
 alone or in any derivative version, provided, however, that PSF's
 License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
 2001 Python Software Foundation; All Rights Reserved" are retained in
! Python 2.1.2 alone or in any derivative version prepared by Licensee.

 3. In the event Licensee prepares a derivative work that is based on
! or incorporates Python 2.1.2 or any part thereof, and wants to make
 the 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 2.1.2.

! 4. PSF is making Python 2.1.2 available to Licensee on an "AS IS"
 basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
 IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
! FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.1.2 WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.

 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
! 2.1.2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
! A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.1.2,
 OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.

***************
*** 83,87 ****
 products or services of Licensee, or any third party.

! 8. By copying, installing or otherwise using Python 2.1.1, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.
--- 83,87 ----
 products or services of Licensee, or any third party.

! 8. By copying, installing or otherwise using Python 2.1.2, Licensee
 agrees to be bound by the terms and conditions of this License
 Agreement.