[Python-checkins] CVS: python/dist/src LICENSE,1.18,1.18.16.1 README,1.136.4.1,1.136.4.2

Michael Hudson mwh@users.sourceforge.net
Wed, 27 Feb 2002 05:33:31 -0800


Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv9477

Modified Files:
      Tag: release22-maint
	LICENSE README 
Log Message:
backport my checkin of
    revision 1.19 of LICENSE
    revision 1.140 of README

Add 2002 to PSF copyrights.

+ some other branch specific stuff.


Index: LICENSE
===================================================================
RCS file: /cvsroot/python/python/dist/src/LICENSE,v
retrieving revision 1.18
retrieving revision 1.18.16.1
diff -C2 -d -r1.18 -r1.18.16.1
*** LICENSE	17 Jul 2001 20:14:06 -0000	1.18
--- LICENSE	27 Feb 2002 13:33:29 -0000	1.18.16.1
***************
*** 37,40 ****
--- 37,41 ----
      2.1.1           2.1+2.0.1   2001        PSF         yes
      2.2             2.1.1       2001        PSF         yes
+     2.2.1           2.2         2002        PSF         yes
  
  Footnotes:
***************
*** 67,72 ****
  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.2 alone or in any derivative version prepared by Licensee.
  
  3. In the event Licensee prepares a derivative work that is based on
--- 68,74 ----
  alone or in any derivative version, provided, however, that PSF's
  License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
! 2001, 2002 Python Software Foundation; All Rights Reserved" are
! retained in Python 2.2 alone or in any derivative version prepared by
! Licensee.
  
  3. In the event Licensee prepares a derivative work that is based on

Index: README
===================================================================
RCS file: /cvsroot/python/python/dist/src/README,v
retrieving revision 1.136.4.1
retrieving revision 1.136.4.2
diff -C2 -d -r1.136.4.1 -r1.136.4.2
*** README	22 Feb 2002 13:50:51 -0000	1.136.4.1
--- README	27 Feb 2002 13:33:29 -0000	1.136.4.2
***************
*** 1,6 ****
! This is Python version 2.2
! ==========================
  
! Copyright (c) 2001 Python Software Foundation.
  All rights reserved.
  
--- 1,6 ----
! This is Python version 2.2.1
! ============================
  
! Copyright (c) 2001, 2002 Python Software Foundation.
  All rights reserved.