[Python-checkins] CVS: python/dist/src/Misc COPYRIGHT,1.4,1.5

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Misc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv20516/Misc

Modified Files:
	COPYRIGHT 
Log Message:

The new copyright / license.


Index: COPYRIGHT
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/COPYRIGHT,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** COPYRIGHT	1996/10/25 13:45:43	1.4
--- COPYRIGHT	2000/06/30 18:41:01	1.5
***************
*** 1,27 ****
! Copyright 1991-1995 by 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 names of Stichting Mathematisch
! Centrum or CWI or Corporation for National Research Initiatives or
! CNRI not be used in advertising or publicity pertaining to
! distribution of the software without specific, written prior
! permission.
  
! While CWI is the initial source for this software, a modified version
! is made available by the Corporation for National Research Initiatives
! (CNRI) at the Internet address ftp://ftp.python.org.
  
! STICHTING MATHEMATISCH CENTRUM AND CNRI DISCLAIM ALL WARRANTIES WITH
! REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH
! CENTRUM OR CNRI 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.
--- 1,31 ----
! Copyright (c) 2000, BeOpen.com.
! Copyright (c) 1995-2000, Corporation for National Research Initiatives.
! Copyright (c) 1990-1995, Stichting Mathematisch Centrum.
! All rights reserved.
  
! Redistribution and use in source and binary forms, with or without
! modification, are permitted provided that the following conditions are
! met:
  
! - Redistributions of source code must retain the above copyright
!   notice, this list of conditions and the following disclaimer.
  
! - Redistributions in binary form must reproduce the above copyright
!   notice, this list of conditions and the following disclaimer in the
!   documentation and/or other materials provided with the distribution.
  
! - Neither names of the copyright holders nor the names of their
!   contributors may be used to endorse or promote products derived from
!   this software without specific prior written permission.
! 
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
! "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
! A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
! LIABILITY, WHETHER IN CONTRACT, STRICT 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 SUCH DAMAGE.