Updated license to version 2.1.

a717ebf5 · Jim Fulton · 13b3adab · a717ebf5 · a717ebf5 · a717ebf5
Commit a717ebf5 authored Jun 02, 2004 by Jim Fulton
256 changed files
--- a/trunk/COPYING
+++ b/trunk/COPYING
+See:
+
+ - the copyright notice in: COPYRIGHT.txt
+
+ - The Zope Public License in LICENSE.txt
--- a/trunk/COPYRIGHT.txt
+++ b/trunk/COPYRIGHT.txt
+Copyright (c) 2004 Zope Corporation and Contributors.
+All Rights Reserved.
+
+This software is subject to the provisions of the Zope Public License,
+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
+FOR A PARTICULAR PURPOSE.
--- a/trunk/LICENSE.txt
+++ b/trunk/LICENSE.txt
-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 +12,25 @@ Redistribution and use in source and binary forms, with or
 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.
+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 above
-   copyright notice, this list of conditions, and the following
-   disclaimer in the documentation and/or other materials
-   provided with the distribution.
+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 +38,11 @@ following conditions are met:

 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;
@@ -51,9 +52,3 @@ Disclaimer
  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  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.
--- a/trunk/doc/ZConfig/Makefile
+++ b/trunk/doc/ZConfig/Makefile
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/doc/ZConfig/schema.dtd
+++ b/trunk/doc/ZConfig/schema.dtd
@@ -4,7 +4,7 @@
  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

--- a/trunk/doc/ZConfig/xmlmarkup.perl
+++ b/trunk/doc/ZConfig/xmlmarkup.perl
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/doc/ZConfig/xmlmarkup.sty
+++ b/trunk/doc/ZConfig/xmlmarkup.sty
@@ -4,7 +4,7 @@
 % 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

--- a/trunk/doc/ZConfig/zconfig.tex
+++ b/trunk/doc/ZConfig/zconfig.tex
@@ -4,7 +4,7 @@
 % 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

--- a/trunk/doc/storage.tex
+++ b/trunk/doc/storage.tex
@@ -4,7 +4,7 @@
 % 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

--- a/trunk/setup.py
+++ b/trunk/setup.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/BTreeItemsTemplate.c
+++ b/trunk/src/BTrees/BTreeItemsTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/BTreeModuleTemplate.c
+++ b/trunk/src/BTrees/BTreeModuleTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/BTreeTemplate.c
+++ b/trunk/src/BTrees/BTreeTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/BucketTemplate.c
+++ b/trunk/src/BTrees/BucketTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/IIBTree.py
+++ b/trunk/src/BTrees/IIBTree.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/IOBTree.py
+++ b/trunk/src/BTrees/IOBTree.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/Interfaces.py
+++ b/trunk/src/BTrees/Interfaces.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/Length.py
+++ b/trunk/src/BTrees/Length.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/MergeTemplate.c
+++ b/trunk/src/BTrees/MergeTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/OIBTree.py
+++ b/trunk/src/BTrees/OIBTree.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/OOBTree.py
+++ b/trunk/src/BTrees/OOBTree.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/SetOpTemplate.c
+++ b/trunk/src/BTrees/SetOpTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/SetTemplate.c
+++ b/trunk/src/BTrees/SetTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/TreeSetTemplate.c
+++ b/trunk/src/BTrees/TreeSetTemplate.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/_IIBTree.c
+++ b/trunk/src/BTrees/_IIBTree.c
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/_IOBTree.c
+++ b/trunk/src/BTrees/_IOBTree.c
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/_OIBTree.c
+++ b/trunk/src/BTrees/_OIBTree.c
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/_OOBTree.c
+++ b/trunk/src/BTrees/_OOBTree.c
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/_fsBTree.c
+++ b/trunk/src/BTrees/_fsBTree.c
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/check.py
+++ b/trunk/src/BTrees/check.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/convert.py
+++ b/trunk/src/BTrees/convert.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/sorters.c
+++ b/trunk/src/BTrees/sorters.c
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/BTrees/tests/testBTrees.py
+++ b/trunk/src/BTrees/tests/testBTrees.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/tests/testBTreesUnicode.py
+++ b/trunk/src/BTrees/tests/testBTreesUnicode.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/tests/testConflict.py
+++ b/trunk/src/BTrees/tests/testConflict.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/tests/testSetOps.py
+++ b/trunk/src/BTrees/tests/testSetOps.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/tests/test_btreesubclass.py
+++ b/trunk/src/BTrees/tests/test_btreesubclass.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/tests/test_check.py
+++ b/trunk/src/BTrees/tests/test_check.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/BTrees/tests/test_compare.py
+++ b/trunk/src/BTrees/tests/test_compare.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/Persistence/_Persistence.c
+++ b/trunk/src/Persistence/_Persistence.c
@@ -4,7 +4,7 @@
 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

--- a/trunk/src/Persistence/__init__.py
+++ b/trunk/src/Persistence/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/Persistence/mapping.py
+++ b/trunk/src/Persistence/mapping.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/Persistence/tests/testPersistent.py
+++ b/trunk/src/Persistence/tests/testPersistent.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/Persistence/tests/test_ExtensionClass.py
+++ b/trunk/src/Persistence/tests/test_ExtensionClass.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/Persistence/tests/test_mapping.py
+++ b/trunk/src/Persistence/tests/test_mapping.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ThreadedAsync/LoopCallback.py
+++ b/trunk/src/ThreadedAsync/LoopCallback.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ThreadedAsync/__init__.py
+++ b/trunk/src/ThreadedAsync/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/__init__.py
+++ b/trunk/src/ZConfig/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/cfgparser.py
+++ b/trunk/src/ZConfig/cfgparser.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/cmdline.py
+++ b/trunk/src/ZConfig/cmdline.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/basic/mapping.py
+++ b/trunk/src/ZConfig/components/basic/mapping.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/basic/tests/test_mapping.py
+++ b/trunk/src/ZConfig/components/basic/tests/test_mapping.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/logger/__init__.py
+++ b/trunk/src/ZConfig/components/logger/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/logger/datatypes.py
+++ b/trunk/src/ZConfig/components/logger/datatypes.py
@@ -3,7 +3,7 @@
 # Copyright (c) 2002 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

--- a/trunk/src/ZConfig/components/logger/factory.py
+++ b/trunk/src/ZConfig/components/logger/factory.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/logger/handlers.py
+++ b/trunk/src/ZConfig/components/logger/handlers.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/logger/logger.py
+++ b/trunk/src/ZConfig/components/logger/logger.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/components/logger/loghandler.py
+++ b/trunk/src/ZConfig/components/logger/loghandler.py
@@ -3,7 +3,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

--- a/trunk/src/ZConfig/components/logger/tests/test_logger.py
+++ b/trunk/src/ZConfig/components/logger/tests/test_logger.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/datatypes.py
+++ b/trunk/src/ZConfig/datatypes.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/doc/Makefile
+++ b/trunk/src/ZConfig/doc/Makefile
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/doc/schema.dtd
+++ b/trunk/src/ZConfig/doc/schema.dtd
@@ -4,7 +4,7 @@
  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

--- a/trunk/src/ZConfig/doc/xmlmarkup.perl
+++ b/trunk/src/ZConfig/doc/xmlmarkup.perl
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/doc/xmlmarkup.sty
+++ b/trunk/src/ZConfig/doc/xmlmarkup.sty
@@ -4,7 +4,7 @@
 % 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

--- a/trunk/src/ZConfig/doc/zconfig.tex
+++ b/trunk/src/ZConfig/doc/zconfig.tex
@@ -4,7 +4,7 @@
 % 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

--- a/trunk/src/ZConfig/info.py
+++ b/trunk/src/ZConfig/info.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/loader.py
+++ b/trunk/src/ZConfig/loader.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/matcher.py
+++ b/trunk/src/ZConfig/matcher.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/schema.py
+++ b/trunk/src/ZConfig/schema.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/scripts/zconfig
+++ b/trunk/src/ZConfig/scripts/zconfig
@@ -5,7 +5,7 @@
 # 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

--- a/trunk/src/ZConfig/scripts/zconfig_schema2html
+++ b/trunk/src/ZConfig/scripts/zconfig_schema2html
@@ -5,7 +5,7 @@
 # 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

--- a/trunk/src/ZConfig/substitution.py
+++ b/trunk/src/ZConfig/substitution.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/__init__.py
+++ b/trunk/src/ZConfig/tests/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/library/thing/__init__.py
+++ b/trunk/src/ZConfig/tests/library/thing/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/runtests.py
+++ b/trunk/src/ZConfig/tests/runtests.py
@@ -5,7 +5,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/support.py
+++ b/trunk/src/ZConfig/tests/support.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_cfgimports.py
+++ b/trunk/src/ZConfig/tests/test_cfgimports.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_cmdline.py
+++ b/trunk/src/ZConfig/tests/test_cmdline.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_config.py
+++ b/trunk/src/ZConfig/tests/test_config.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_cookbook.py
+++ b/trunk/src/ZConfig/tests/test_cookbook.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_datatypes.py
+++ b/trunk/src/ZConfig/tests/test_datatypes.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_loader.py
+++ b/trunk/src/ZConfig/tests/test_loader.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_schema.py
+++ b/trunk/src/ZConfig/tests/test_schema.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/tests/test_subst.py
+++ b/trunk/src/ZConfig/tests/test_subst.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZConfig/url.py
+++ b/trunk/src/ZConfig/url.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/ClientStorage.py
+++ b/trunk/src/ZEO/ClientStorage.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/ClientStub.py
+++ b/trunk/src/ZEO/ClientStub.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/CommitLog.py
+++ b/trunk/src/ZEO/CommitLog.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/DebugServer.py
+++ b/trunk/src/ZEO/DebugServer.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/Exceptions.py
+++ b/trunk/src/ZEO/Exceptions.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/ServerStub.py
+++ b/trunk/src/ZEO/ServerStub.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/StorageServer.py
+++ b/trunk/src/ZEO/StorageServer.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/TransactionBuffer.py
+++ b/trunk/src/ZEO/TransactionBuffer.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/__init__.py
+++ b/trunk/src/ZEO/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/auth/__init__.py
+++ b/trunk/src/ZEO/auth/__init__.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/auth/auth_digest.py
+++ b/trunk/src/ZEO/auth/auth_digest.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/auth/base.py
+++ b/trunk/src/ZEO/auth/base.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/cache.py
+++ b/trunk/src/ZEO/cache.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/mkzeoinst.py
+++ b/trunk/src/ZEO/mkzeoinst.py
@@ -5,7 +5,7 @@
 # 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

--- a/trunk/src/ZEO/monitor.py
+++ b/trunk/src/ZEO/monitor.py
@@ -4,7 +4,7 @@
 # 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

--- a/trunk/src/ZEO/runzeo.py
+++ b/trunk/src/ZEO/runzeo.py
--- a/trunk/src/ZEO/simul.py
+++ b/trunk/src/ZEO/simul.py
--- a/trunk/src/ZEO/stats.py
+++ b/trunk/src/ZEO/stats.py
--- a/trunk/src/ZEO/tests/Cache.py
+++ b/trunk/src/ZEO/tests/Cache.py
--- a/trunk/src/ZEO/tests/CommitLockTests.py
+++ b/trunk/src/ZEO/tests/CommitLockTests.py
--- a/trunk/src/ZEO/tests/ConnectionTests.py
+++ b/trunk/src/ZEO/tests/ConnectionTests.py
--- a/trunk/src/ZEO/tests/InvalidationTests.py
+++ b/trunk/src/ZEO/tests/InvalidationTests.py
--- a/trunk/src/ZEO/tests/TestThread.py
+++ b/trunk/src/ZEO/tests/TestThread.py
--- a/trunk/src/ZEO/tests/ThreadTests.py
+++ b/trunk/src/ZEO/tests/ThreadTests.py
--- a/trunk/src/ZEO/tests/__init__.py
+++ b/trunk/src/ZEO/tests/__init__.py
--- a/trunk/src/ZEO/tests/auth_plaintext.py
+++ b/trunk/src/ZEO/tests/auth_plaintext.py
--- a/trunk/src/ZEO/tests/forker.py
+++ b/trunk/src/ZEO/tests/forker.py
--- a/trunk/src/ZEO/tests/multi.py
+++ b/trunk/src/ZEO/tests/multi.py
--- a/trunk/src/ZEO/tests/speed.py
+++ b/trunk/src/ZEO/tests/speed.py
--- a/trunk/src/ZEO/tests/stress.py
+++ b/trunk/src/ZEO/tests/stress.py
--- a/trunk/src/ZEO/tests/testAuth.py
+++ b/trunk/src/ZEO/tests/testAuth.py
--- a/trunk/src/ZEO/tests/testConnection.py
+++ b/trunk/src/ZEO/tests/testConnection.py
--- a/trunk/src/ZEO/tests/testMonitor.py
+++ b/trunk/src/ZEO/tests/testMonitor.py
--- a/trunk/src/ZEO/tests/testTransactionBuffer.py
+++ b/trunk/src/ZEO/tests/testTransactionBuffer.py
--- a/trunk/src/ZEO/tests/testZEO.py
+++ b/trunk/src/ZEO/tests/testZEO.py
--- a/trunk/src/ZEO/tests/testZEOOptions.py
+++ b/trunk/src/ZEO/tests/testZEOOptions.py
--- a/trunk/src/ZEO/tests/test_cache.py
+++ b/trunk/src/ZEO/tests/test_cache.py
--- a/trunk/src/ZEO/tests/zeoserver.py
+++ b/trunk/src/ZEO/tests/zeoserver.py
--- a/trunk/src/ZEO/util.py
+++ b/trunk/src/ZEO/util.py
--- a/trunk/src/ZEO/zeopasswd.py
+++ b/trunk/src/ZEO/zeopasswd.py
--- a/trunk/src/ZEO/zrpc/__init__.py
+++ b/trunk/src/ZEO/zrpc/__init__.py
--- a/trunk/src/ZEO/zrpc/client.py
+++ b/trunk/src/ZEO/zrpc/client.py
--- a/trunk/src/ZEO/zrpc/connection.py
+++ b/trunk/src/ZEO/zrpc/connection.py
--- a/trunk/src/ZEO/zrpc/error.py
+++ b/trunk/src/ZEO/zrpc/error.py
--- a/trunk/src/ZEO/zrpc/log.py
+++ b/trunk/src/ZEO/zrpc/log.py
--- a/trunk/src/ZEO/zrpc/marshal.py
+++ b/trunk/src/ZEO/zrpc/marshal.py
--- a/trunk/src/ZEO/zrpc/server.py
+++ b/trunk/src/ZEO/zrpc/server.py
--- a/trunk/src/ZEO/zrpc/smac.py
+++ b/trunk/src/ZEO/zrpc/smac.py
--- a/trunk/src/ZEO/zrpc/trigger.py
+++ b/trunk/src/ZEO/zrpc/trigger.py
--- a/trunk/src/ZODB/ActivityMonitor.py
+++ b/trunk/src/ZODB/ActivityMonitor.py
--- a/trunk/src/ZODB/BaseStorage.py
+++ b/trunk/src/ZODB/BaseStorage.py
--- a/trunk/src/ZODB/ConflictResolution.py
+++ b/trunk/src/ZODB/ConflictResolution.py
--- a/trunk/src/ZODB/Connection.py
+++ b/trunk/src/ZODB/Connection.py
--- a/trunk/src/ZODB/DB.py
+++ b/trunk/src/ZODB/DB.py
--- a/trunk/src/ZODB/DemoStorage.py
+++ b/trunk/src/ZODB/DemoStorage.py
--- a/trunk/src/ZODB/ExportImport.py
+++ b/trunk/src/ZODB/ExportImport.py
--- a/trunk/src/ZODB/FileStorage/FileStorage.py
+++ b/trunk/src/ZODB/FileStorage/FileStorage.py
--- a/trunk/src/ZODB/FileStorage/format.py
+++ b/trunk/src/ZODB/FileStorage/format.py
--- a/trunk/src/ZODB/FileStorage/fspack.py
+++ b/trunk/src/ZODB/FileStorage/fspack.py
--- a/trunk/src/ZODB/MappingStorage.py
+++ b/trunk/src/ZODB/MappingStorage.py
--- a/trunk/src/ZODB/Mount.py
+++ b/trunk/src/ZODB/Mount.py
--- a/trunk/src/ZODB/POSException.py
+++ b/trunk/src/ZODB/POSException.py
--- a/trunk/src/ZODB/TmpStore.py
+++ b/trunk/src/ZODB/TmpStore.py
--- a/trunk/src/ZODB/UndoLogCompatible.py
+++ b/trunk/src/ZODB/UndoLogCompatible.py
--- a/trunk/src/ZODB/ZApplication.py
+++ b/trunk/src/ZODB/ZApplication.py
--- a/trunk/src/ZODB/__init__.py
+++ b/trunk/src/ZODB/__init__.py
--- a/trunk/src/ZODB/broken.py
+++ b/trunk/src/ZODB/broken.py
--- a/trunk/src/ZODB/config.py
+++ b/trunk/src/ZODB/config.py
--- a/trunk/src/ZODB/conversionhack.py
+++ b/trunk/src/ZODB/conversionhack.py
--- a/trunk/src/ZODB/dbmStorage.py
+++ b/trunk/src/ZODB/dbmStorage.py
--- a/trunk/src/ZODB/fsIndex.py
+++ b/trunk/src/ZODB/fsIndex.py
--- a/trunk/src/ZODB/fsrecover.py
+++ b/trunk/src/ZODB/fsrecover.py
--- a/trunk/src/ZODB/fstools.py
+++ b/trunk/src/ZODB/fstools.py
--- a/trunk/src/ZODB/interfaces.py
+++ b/trunk/src/ZODB/interfaces.py
--- a/trunk/src/ZODB/lock_file.py
+++ b/trunk/src/ZODB/lock_file.py
--- a/trunk/src/ZODB/loglevels.py
+++ b/trunk/src/ZODB/loglevels.py
--- a/trunk/src/ZODB/serialize.py
+++ b/trunk/src/ZODB/serialize.py
--- a/trunk/src/ZODB/tests/BasicStorage.py
+++ b/trunk/src/ZODB/tests/BasicStorage.py
--- a/trunk/src/ZODB/tests/ConflictResolution.py
+++ b/trunk/src/ZODB/tests/ConflictResolution.py
--- a/trunk/src/ZODB/tests/Corruption.py
+++ b/trunk/src/ZODB/tests/Corruption.py
--- a/trunk/src/ZODB/tests/HistoryStorage.py
+++ b/trunk/src/ZODB/tests/HistoryStorage.py
--- a/trunk/src/ZODB/tests/IteratorStorage.py
+++ b/trunk/src/ZODB/tests/IteratorStorage.py
--- a/trunk/src/ZODB/tests/LocalStorage.py
+++ b/trunk/src/ZODB/tests/LocalStorage.py
--- a/trunk/src/ZODB/tests/MinPO.py
+++ b/trunk/src/ZODB/tests/MinPO.py
--- a/trunk/src/ZODB/tests/PackableStorage.py
+++ b/trunk/src/ZODB/tests/PackableStorage.py
--- a/trunk/src/ZODB/tests/PersistentStorage.py
+++ b/trunk/src/ZODB/tests/PersistentStorage.py
--- a/trunk/src/ZODB/tests/ReadOnlyStorage.py
+++ b/trunk/src/ZODB/tests/ReadOnlyStorage.py
--- a/trunk/src/ZODB/tests/RecoveryStorage.py
+++ b/trunk/src/ZODB/tests/RecoveryStorage.py
--- a/trunk/src/ZODB/tests/RevisionStorage.py
+++ b/trunk/src/ZODB/tests/RevisionStorage.py
--- a/trunk/src/ZODB/tests/StorageTestBase.py
+++ b/trunk/src/ZODB/tests/StorageTestBase.py
--- a/trunk/src/ZODB/tests/Synchronization.py
+++ b/trunk/src/ZODB/tests/Synchronization.py
--- a/trunk/src/ZODB/tests/TransactionalUndoStorage.py
+++ b/trunk/src/ZODB/tests/TransactionalUndoStorage.py
--- a/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py
+++ b/trunk/src/ZODB/tests/TransactionalUndoVersionStorage.py
--- a/trunk/src/ZODB/tests/VersionStorage.py
+++ b/trunk/src/ZODB/tests/VersionStorage.py
--- a/trunk/src/ZODB/tests/dangle.py
+++ b/trunk/src/ZODB/tests/dangle.py
--- a/trunk/src/ZODB/tests/sampledm.py
+++ b/trunk/src/ZODB/tests/sampledm.py
--- a/trunk/src/ZODB/tests/speed.py
+++ b/trunk/src/ZODB/tests/speed.py
--- a/trunk/src/ZODB/tests/testActivityMonitor.py
+++ b/trunk/src/ZODB/tests/testActivityMonitor.py
--- a/trunk/src/ZODB/tests/testBroken.py
+++ b/trunk/src/ZODB/tests/testBroken.py
--- a/trunk/src/ZODB/tests/testCache.py
+++ b/trunk/src/ZODB/tests/testCache.py
--- a/trunk/src/ZODB/tests/testConfig.py
+++ b/trunk/src/ZODB/tests/testConfig.py
--- a/trunk/src/ZODB/tests/testConnection.py
+++ b/trunk/src/ZODB/tests/testConnection.py
--- a/trunk/src/ZODB/tests/testDB.py
+++ b/trunk/src/ZODB/tests/testDB.py
--- a/trunk/src/ZODB/tests/testDemoStorage.py
+++ b/trunk/src/ZODB/tests/testDemoStorage.py
--- a/trunk/src/ZODB/tests/testFileStorage.py
+++ b/trunk/src/ZODB/tests/testFileStorage.py
--- a/trunk/src/ZODB/tests/testMappingStorage.py
+++ b/trunk/src/ZODB/tests/testMappingStorage.py
--- a/trunk/src/ZODB/tests/testPersistentList.py
+++ b/trunk/src/ZODB/tests/testPersistentList.py
--- a/trunk/src/ZODB/tests/testPersistentMapping.py
+++ b/trunk/src/ZODB/tests/testPersistentMapping.py
--- a/trunk/src/ZODB/tests/testRecover.py
+++ b/trunk/src/ZODB/tests/testRecover.py
--- a/trunk/src/ZODB/tests/testSerialize.py
+++ b/trunk/src/ZODB/tests/testSerialize.py
--- a/trunk/src/ZODB/tests/testSubTransaction.py
+++ b/trunk/src/ZODB/tests/testSubTransaction.py
--- a/trunk/src/ZODB/tests/testTimeStamp.py
+++ b/trunk/src/ZODB/tests/testTimeStamp.py
--- a/trunk/src/ZODB/tests/testUtils.py
+++ b/trunk/src/ZODB/tests/testUtils.py
--- a/trunk/src/ZODB/tests/testZODB.py
+++ b/trunk/src/ZODB/tests/testZODB.py
--- a/trunk/src/ZODB/tests/test_cache.py
+++ b/trunk/src/ZODB/tests/test_cache.py
--- a/trunk/src/ZODB/tests/test_datamanageradapter.py
+++ b/trunk/src/ZODB/tests/test_datamanageradapter.py
--- a/trunk/src/ZODB/tests/test_storage.py
+++ b/trunk/src/ZODB/tests/test_storage.py
--- a/trunk/src/ZODB/tests/testfsIndex.py
+++ b/trunk/src/ZODB/tests/testfsIndex.py
--- a/trunk/src/ZODB/tests/testmvcc.py
+++ b/trunk/src/ZODB/tests/testmvcc.py
--- a/trunk/src/ZODB/tests/util.py
+++ b/trunk/src/ZODB/tests/util.py
--- a/trunk/src/ZODB/tests/warnhook.py
+++ b/trunk/src/ZODB/tests/warnhook.py
--- a/trunk/src/ZODB/transact.py
+++ b/trunk/src/ZODB/transact.py
--- a/trunk/src/ZODB/utils.py
+++ b/trunk/src/ZODB/utils.py
--- a/trunk/src/ZODB/winlock.c
+++ b/trunk/src/ZODB/winlock.c
--- a/trunk/src/ZopeUndo/Prefix.py
+++ b/trunk/src/ZopeUndo/Prefix.py
--- a/trunk/src/ZopeUndo/__init__.py
+++ b/trunk/src/ZopeUndo/__init__.py
--- a/trunk/src/ZopeUndo/tests/__init__.py
+++ b/trunk/src/ZopeUndo/tests/__init__.py
--- a/trunk/src/ZopeUndo/tests/testPrefix.py
+++ b/trunk/src/ZopeUndo/tests/testPrefix.py
--- a/trunk/src/persistent/TimeStamp.c
+++ b/trunk/src/persistent/TimeStamp.c
--- a/trunk/src/persistent/__init__.py
+++ b/trunk/src/persistent/__init__.py
--- a/trunk/src/persistent/cPersistence.c
+++ b/trunk/src/persistent/cPersistence.c
--- a/trunk/src/persistent/cPersistence.h
+++ b/trunk/src/persistent/cPersistence.h
--- a/trunk/src/persistent/cPickleCache.c
+++ b/trunk/src/persistent/cPickleCache.c
--- a/trunk/src/persistent/dict.py
+++ b/trunk/src/persistent/dict.py
--- a/trunk/src/persistent/interfaces.py
+++ b/trunk/src/persistent/interfaces.py
--- a/trunk/src/persistent/list.py
+++ b/trunk/src/persistent/list.py
--- a/trunk/src/persistent/mapping.py
+++ b/trunk/src/persistent/mapping.py
--- a/trunk/src/persistent/ring.c
+++ b/trunk/src/persistent/ring.c
--- a/trunk/src/persistent/ring.h
+++ b/trunk/src/persistent/ring.h
--- a/trunk/src/persistent/tests/persistenttestbase.py
+++ b/trunk/src/persistent/tests/persistenttestbase.py
--- a/trunk/src/persistent/tests/testPersistent.py
+++ b/trunk/src/persistent/tests/testPersistent.py
--- a/trunk/src/persistent/tests/test_PickleCache.py
+++ b/trunk/src/persistent/tests/test_PickleCache.py
--- a/trunk/src/persistent/tests/test_list.py
+++ b/trunk/src/persistent/tests/test_list.py
--- a/trunk/src/persistent/tests/test_overriding_attrs.py
+++ b/trunk/src/persistent/tests/test_overriding_attrs.py
--- a/trunk/src/persistent/tests/test_persistent.py
+++ b/trunk/src/persistent/tests/test_persistent.py
--- a/trunk/src/persistent/tests/test_pickle.py
+++ b/trunk/src/persistent/tests/test_pickle.py
--- a/trunk/src/persistent/tests/test_wref.py
+++ b/trunk/src/persistent/tests/test_wref.py
--- a/trunk/src/persistent/wref.py
+++ b/trunk/src/persistent/wref.py
--- a/trunk/src/scripts/fsrefs.py
+++ b/trunk/src/scripts/fsrefs.py
--- a/trunk/src/scripts/fstail.py
+++ b/trunk/src/scripts/fstail.py
--- a/trunk/src/scripts/fstest.py
+++ b/trunk/src/scripts/fstest.py
--- a/trunk/src/scripts/migrate.py
+++ b/trunk/src/scripts/migrate.py
--- a/trunk/src/scripts/tests/testrepozo.py
+++ b/trunk/src/scripts/tests/testrepozo.py
--- a/trunk/src/scripts/zeoserverlog.py
+++ b/trunk/src/scripts/zeoserverlog.py
--- a/trunk/src/scripts/zodbload.py
+++ b/trunk/src/scripts/zodbload.py
--- a/trunk/src/transaction/__init__.py
+++ b/trunk/src/transaction/__init__.py
--- a/trunk/src/transaction/_manager.py
+++ b/trunk/src/transaction/_manager.py
--- a/trunk/src/transaction/_transaction.py
+++ b/trunk/src/transaction/_transaction.py
--- a/trunk/src/transaction/interfaces.py
+++ b/trunk/src/transaction/interfaces.py
--- a/trunk/src/transaction/tests/abstestIDataManager.py
+++ b/trunk/src/transaction/tests/abstestIDataManager.py
--- a/trunk/src/transaction/tests/test_SampleDataManager.py
+++ b/trunk/src/transaction/tests/test_SampleDataManager.py
--- a/trunk/src/transaction/tests/test_register_compat.py
+++ b/trunk/src/transaction/tests/test_register_compat.py
--- a/trunk/src/transaction/tests/test_transaction.py
+++ b/trunk/src/transaction/tests/test_transaction.py
--- a/trunk/src/transaction/tests/test_util.py
+++ b/trunk/src/transaction/tests/test_util.py
--- a/trunk/src/transaction/util.py
+++ b/trunk/src/transaction/util.py
--- a/trunk/src/zdaemon/__init__.py
+++ b/trunk/src/zdaemon/__init__.py
--- a/trunk/src/zdaemon/tests/testzdoptions.py
+++ b/trunk/src/zdaemon/tests/testzdoptions.py
--- a/trunk/src/zdaemon/zdctl.py
+++ b/trunk/src/zdaemon/zdctl.py
--- a/trunk/src/zdaemon/zdoptions.py
+++ b/trunk/src/zdaemon/zdoptions.py
--- a/trunk/src/zdaemon/zdrun.py
+++ b/trunk/src/zdaemon/zdrun.py
--- a/trunk/test.py
+++ b/trunk/test.py