[CMF-checkins] CVS: CMF - CHANGES.txt:1.247 LICENSE.txt:1.2 all_cmf_tests.py:1.13

[Jens Vagelpohl]

Update of /cvs-repository/CMF
In directory cvs.zope.org:/tmp/cvs-serv1744

Modified Files:
	CHANGES.txt LICENSE.txt all_cmf_tests.py 
Log Message:
Sorry for the noise - switching everything from ZPL 2.0 to ZPL 2.1



=== CMF/CHANGES.txt 1.246 => 1.247 ===
--- CMF/CHANGES.txt:1.246	Wed Aug 11 08:11:48 2004
+++ CMF/CHANGES.txt	Thu Aug 12 11:07:36 2004
@@ -2,6 +2,9 @@
 
   New Features
 
+    - The CMF is now under the terms of version 2.1 of the Zope Public
+      License (ZPL), it was previously under ZPL version 2.0.
+
     - TypeInfos: Marked getActionById as deprecated.
       Use getActionInfo if you need an URL or getMethodPath if you need a
       method.


=== CMF/LICENSE.txt 1.1 => 1.2 ===
--- CMF/LICENSE.txt:1.1	Wed Nov 28 14:06:23 2001
+++ CMF/LICENSE.txt	Thu Aug 12 11:07:36 2004
@@ -1,8 +1,7 @@
-Zope Public License (ZPL) Version 2.0
------------------------------------------------
+Zope Public License (ZPL) Version 2.1
 
-This software is Copyright (c) Zope Corporation (tm) and
-Contributors. All rights reserved.
+A copyright notice accompanies this license document that
+identifies the copyright holders.
 
 This license has been certified as open source. It has also
 been designated as GPL compatible by the Free Software
@@ -12,24 +11,25 @@
 without modification, are permitted provided that the
 following conditions are met:
 
-1. Redistributions in source code must retain the above
-   copyright notice, this list of conditions, and the following
-   disclaimer.
-
-2. 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.
+1. Redistributions in source code must retain the
+   accompanying copyright notice, this list of conditions,
+   and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying
+   copyright notice, this list of conditions, and the
+   following disclaimer in the documentation and/or other
+   materials provided with the distribution.
 
-3. The name Zope Corporation (tm) must not be used to
+3. Names of the copyright holders must not be used to
    endorse or promote products derived from this software
-   without prior written permission from Zope Corporation.
+   without prior written permission from the copyright
+   holders.
 
 4. The right to distribute this software or to use it for
-   any purpose does not give you the right to use Servicemarks
-   (sm) or Trademarks (tm) of Zope Corporation. Use of them is
-   covered in a separate agreement (see
-   http://www.zope.com/Marks).
+   any purpose does not give you the right to use
+   Servicemarks (sm) or Trademarks (tm) of the copyright
+   holders. Use of them is covered by separate agreement
+   with the copyright holders.
 
 5. If any files are modified, you must cause the modified
    files to carry prominent notices stating that you changed
@@ -37,11 +37,11 @@
 
 Disclaimer
 
-  THIS SOFTWARE IS PROVIDED BY ZOPE CORPORATION ``AS IS''
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
   AND ANY EXPRESSED 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 ZOPE CORPORATION OR ITS CONTRIBUTORS BE
+  NO EVENT SHALL THE COPYRIGHT HOLDERS BE
   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
@@ -52,8 +52,3 @@
   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
   DAMAGE.
 
-
-This software consists of contributions made by Zope
-Corporation and many individuals on behalf of Zope
-Corporation.  Specific attributions are listed in the
-accompanying credits file.


=== CMF/all_cmf_tests.py 1.12 => 1.13 ===
--- CMF/all_cmf_tests.py:1.12	Mon Aug  2 16:59:24 2004
+++ CMF/all_cmf_tests.py	Thu Aug 12 11:07:36 2004
@@ -5,7 +5,7 @@
 # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
-# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS