[Checkins] SVN: PluggableAuthService/branches/1. Comply with repository policy.

Tres Seaver tseaver at palladion.com
Thu Apr 8 11:26:05 EDT 2010


Log message for revision 110647:
  Comply with repository policy.

Changed:
  U   PluggableAuthService/branches/1.1/COPYRIGHT.txt
  U   PluggableAuthService/branches/1.1/Extensions/basic_auth.py
  U   PluggableAuthService/branches/1.1/Extensions/upgrade.py
  U   PluggableAuthService/branches/1.1/LICENSE.txt
  U   PluggableAuthService/branches/1.1/PluggableAuthService.py
  U   PluggableAuthService/branches/1.1/PropertiedUser.py
  U   PluggableAuthService/branches/1.1/UserPropertySheet.py
  U   PluggableAuthService/branches/1.1/__init__.py
  U   PluggableAuthService/branches/1.1/interfaces/__init__.py
  U   PluggableAuthService/branches/1.1/interfaces/authservice.py
  U   PluggableAuthService/branches/1.1/interfaces/plugins.py
  U   PluggableAuthService/branches/1.1/interfaces/propertysheets.py
  U   PluggableAuthService/branches/1.1/permissions.py
  U   PluggableAuthService/branches/1.1/plugins/BasePlugin.py
  U   PluggableAuthService/branches/1.1/plugins/CookieAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/DelegatingMultiPlugin.py
  U   PluggableAuthService/branches/1.1/plugins/DomainAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/DynamicGroupsPlugin.py
  U   PluggableAuthService/branches/1.1/plugins/HTTPBasicAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/InlineAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/LocalRolePlugin.py
  U   PluggableAuthService/branches/1.1/plugins/RecursiveGroupsPlugin.py
  U   PluggableAuthService/branches/1.1/plugins/ScriptablePlugin.py
  U   PluggableAuthService/branches/1.1/plugins/SearchPrincipalsPlugin.py
  U   PluggableAuthService/branches/1.1/plugins/SessionAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/ZODBGroupManager.py
  U   PluggableAuthService/branches/1.1/plugins/ZODBRoleManager.py
  U   PluggableAuthService/branches/1.1/plugins/ZODBUserManager.py
  U   PluggableAuthService/branches/1.1/plugins/__init__.py
  U   PluggableAuthService/branches/1.1/plugins/tests/__init__.py
  U   PluggableAuthService/branches/1.1/plugins/tests/helpers.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_CookieAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_DynamicGroupsPlugin.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_HTTPBasicAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_InlineAuthHelper.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_LocalRolePlugin.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_RecursiveGroupsPlugin.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_ScriptablePlugin.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_ZODBGroupManager.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_ZODBRoleManager.py
  U   PluggableAuthService/branches/1.1/plugins/tests/test_ZODBUserManager.py
  U   PluggableAuthService/branches/1.1/tests/__init__.py
  U   PluggableAuthService/branches/1.1/tests/conformance.py
  U   PluggableAuthService/branches/1.1/tests/test_Caching.py
  U   PluggableAuthService/branches/1.1/tests/test_PluggableAuthService.py
  U   PluggableAuthService/branches/1.1/tests/test_PropertiedUser.py
  U   PluggableAuthService/branches/1.1/tests/test_UserPropertySheet.py
  U   PluggableAuthService/branches/1.1/utils.py
  U   PluggableAuthService/branches/1.4/COPYRIGHT.txt
  U   PluggableAuthService/branches/1.4/Extensions/basic_auth.py
  U   PluggableAuthService/branches/1.4/Extensions/upgrade.py
  U   PluggableAuthService/branches/1.4/LICENSE.txt
  U   PluggableAuthService/branches/1.4/PluggableAuthService.py
  U   PluggableAuthService/branches/1.4/PropertiedUser.py
  U   PluggableAuthService/branches/1.4/UserPropertySheet.py
  U   PluggableAuthService/branches/1.4/__init__.py
  U   PluggableAuthService/branches/1.4/exportimport.py
  U   PluggableAuthService/branches/1.4/interfaces/__init__.py
  U   PluggableAuthService/branches/1.4/interfaces/authservice.py
  U   PluggableAuthService/branches/1.4/interfaces/plugins.py
  U   PluggableAuthService/branches/1.4/interfaces/propertysheets.py
  U   PluggableAuthService/branches/1.4/interfaces/request.py
  U   PluggableAuthService/branches/1.4/permissions.py
  U   PluggableAuthService/branches/1.4/plugins/BasePlugin.py
  U   PluggableAuthService/branches/1.4/plugins/ChallengeProtocolChooser.py
  U   PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/DelegatingMultiPlugin.py
  U   PluggableAuthService/branches/1.4/plugins/DomainAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/DynamicGroupsPlugin.py
  U   PluggableAuthService/branches/1.4/plugins/HTTPBasicAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/InlineAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/LocalRolePlugin.py
  U   PluggableAuthService/branches/1.4/plugins/RecursiveGroupsPlugin.py
  U   PluggableAuthService/branches/1.4/plugins/RequestTypeSniffer.py
  U   PluggableAuthService/branches/1.4/plugins/ScriptablePlugin.py
  U   PluggableAuthService/branches/1.4/plugins/SearchPrincipalsPlugin.py
  U   PluggableAuthService/branches/1.4/plugins/SessionAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/ZODBGroupManager.py
  U   PluggableAuthService/branches/1.4/plugins/ZODBRoleManager.py
  U   PluggableAuthService/branches/1.4/plugins/ZODBUserManager.py
  U   PluggableAuthService/branches/1.4/plugins/__init__.py
  U   PluggableAuthService/branches/1.4/plugins/exportimport.py
  U   PluggableAuthService/branches/1.4/plugins/tests/__init__.py
  U   PluggableAuthService/branches/1.4/plugins/tests/helpers.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_ChallengeProtocolChooser.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_CookieAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_DomainAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_DynamicGroupsPlugin.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_HTTPBasicAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_InlineAuthHelper.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_LocalRolePlugin.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_RecursiveGroupsPlugin.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_RequestTypeSniffer.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_ScriptablePlugin.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_ZODBGroupManager.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_ZODBRoleManager.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_ZODBUserManager.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_doctests.py
  U   PluggableAuthService/branches/1.4/plugins/tests/test_exportimport.py
  U   PluggableAuthService/branches/1.4/tests/__init__.py
  U   PluggableAuthService/branches/1.4/tests/conformance.py
  U   PluggableAuthService/branches/1.4/tests/test_Caching.py
  U   PluggableAuthService/branches/1.4/tests/test_PluggableAuthService.py
  U   PluggableAuthService/branches/1.4/tests/test_PropertiedUser.py
  U   PluggableAuthService/branches/1.4/tests/test_UserPropertySheet.py
  U   PluggableAuthService/branches/1.4/tests/test_exportimport.py
  U   PluggableAuthService/branches/1.4/tests/test_utils.py
  U   PluggableAuthService/branches/1.4/utils.py

-=-
Modified: PluggableAuthService/branches/1.1/COPYRIGHT.txt
===================================================================
--- PluggableAuthService/branches/1.1/COPYRIGHT.txt	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/COPYRIGHT.txt	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,9 +1 @@
-Copyright (c) 2004 Zope Corporation (TM) 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.
+Zope Foundation and Contributors
\ No newline at end of file

Modified: PluggableAuthService/branches/1.1/Extensions/basic_auth.py
===================================================================
--- PluggableAuthService/branches/1.1/Extensions/basic_auth.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/Extensions/basic_auth.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/Extensions/upgrade.py
===================================================================
--- PluggableAuthService/branches/1.1/Extensions/upgrade.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/Extensions/upgrade.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation. All Rights Reserved.
+# Copyright (c) 2004 Zope Foundation and Contributors.
 #
 # This software is subject to the provisions of the Zope Visible Source 
 # License, Version 1.0 (ZVSL).  A copy of the ZVSL should accompany this 

Modified: PluggableAuthService/branches/1.1/LICENSE.txt
===================================================================
--- PluggableAuthService/branches/1.1/LICENSE.txt	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/LICENSE.txt	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,54 +1,44 @@
 Zope Public License (ZPL) Version 2.1
 
-A copyright notice accompanies this license document that
-identifies the copyright holders.
+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
-Foundation (FSF).
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
 
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
+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
-   accompanying 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 accompanying
-   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. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software 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 the copyright
-   holders. Use of them is covered by separate agreement
-   with 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 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
-   the files and the date of any change.
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
 
 Disclaimer
 
-  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 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;
-  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.
-
+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 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; 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.

Modified: PluggableAuthService/branches/1.1/PluggableAuthService.py
===================================================================
--- PluggableAuthService/branches/1.1/PluggableAuthService.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/PluggableAuthService.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/PropertiedUser.py
===================================================================
--- PluggableAuthService/branches/1.1/PropertiedUser.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/PropertiedUser.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/UserPropertySheet.py
===================================================================
--- PluggableAuthService/branches/1.1/UserPropertySheet.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/UserPropertySheet.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/__init__.py
===================================================================
--- PluggableAuthService/branches/1.1/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/interfaces/__init__.py
===================================================================
--- PluggableAuthService/branches/1.1/interfaces/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/interfaces/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/interfaces/authservice.py
===================================================================
--- PluggableAuthService/branches/1.1/interfaces/authservice.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/interfaces/authservice.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/interfaces/plugins.py
===================================================================
--- PluggableAuthService/branches/1.1/interfaces/plugins.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/interfaces/plugins.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/interfaces/propertysheets.py
===================================================================
--- PluggableAuthService/branches/1.1/interfaces/propertysheets.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/interfaces/propertysheets.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/permissions.py
===================================================================
--- PluggableAuthService/branches/1.1/permissions.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/permissions.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/BasePlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/BasePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/BasePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/CookieAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/CookieAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/CookieAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/DelegatingMultiPlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/DelegatingMultiPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/DelegatingMultiPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/DomainAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/DomainAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/DomainAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/DynamicGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/DynamicGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/DynamicGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/HTTPBasicAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/HTTPBasicAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/HTTPBasicAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/InlineAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/InlineAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/InlineAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/LocalRolePlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/LocalRolePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/LocalRolePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/RecursiveGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/RecursiveGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/RecursiveGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/ScriptablePlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/ScriptablePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/ScriptablePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/SearchPrincipalsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/SearchPrincipalsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/SearchPrincipalsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/SessionAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/SessionAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/SessionAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/ZODBGroupManager.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/ZODBGroupManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/ZODBGroupManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/ZODBRoleManager.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/ZODBRoleManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/ZODBRoleManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/ZODBUserManager.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/ZODBUserManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/ZODBUserManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/__init__.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/__init__.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/helpers.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/helpers.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/helpers.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_CookieAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_CookieAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_CookieAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_DynamicGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_DynamicGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_DynamicGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_HTTPBasicAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_HTTPBasicAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_HTTPBasicAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_InlineAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_InlineAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_InlineAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_LocalRolePlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_LocalRolePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_LocalRolePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_RecursiveGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_RecursiveGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_RecursiveGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_ScriptablePlugin.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_ScriptablePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_ScriptablePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_ZODBGroupManager.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_ZODBGroupManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_ZODBGroupManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_ZODBRoleManager.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_ZODBRoleManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_ZODBRoleManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/plugins/tests/test_ZODBUserManager.py
===================================================================
--- PluggableAuthService/branches/1.1/plugins/tests/test_ZODBUserManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/plugins/tests/test_ZODBUserManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/tests/__init__.py
===================================================================
--- PluggableAuthService/branches/1.1/tests/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/tests/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/tests/conformance.py
===================================================================
--- PluggableAuthService/branches/1.1/tests/conformance.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/tests/conformance.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/tests/test_Caching.py
===================================================================
--- PluggableAuthService/branches/1.1/tests/test_Caching.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/tests/test_Caching.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/tests/test_PluggableAuthService.py
===================================================================
--- PluggableAuthService/branches/1.1/tests/test_PluggableAuthService.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/tests/test_PluggableAuthService.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/tests/test_PropertiedUser.py
===================================================================
--- PluggableAuthService/branches/1.1/tests/test_PropertiedUser.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/tests/test_PropertiedUser.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/tests/test_UserPropertySheet.py
===================================================================
--- PluggableAuthService/branches/1.1/tests/test_UserPropertySheet.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/tests/test_UserPropertySheet.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.1/utils.py
===================================================================
--- PluggableAuthService/branches/1.1/utils.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.1/utils.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/COPYRIGHT.txt
===================================================================
--- PluggableAuthService/branches/1.4/COPYRIGHT.txt	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/COPYRIGHT.txt	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,9 +1 @@
-Copyright (c) 2004-2006 Zope Corporation (TM) 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.
+Zope Foundation and Contributors
\ No newline at end of file

Modified: PluggableAuthService/branches/1.4/Extensions/basic_auth.py
===================================================================
--- PluggableAuthService/branches/1.4/Extensions/basic_auth.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/Extensions/basic_auth.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/Extensions/upgrade.py
===================================================================
--- PluggableAuthService/branches/1.4/Extensions/upgrade.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/Extensions/upgrade.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation. All Rights Reserved.
+# Copyright (c) 2004 Zope Foundation and Contributors.
 #
 # This software is subject to the provisions of the Zope Visible Source 
 # License, Version 1.0 (ZVSL).  A copy of the ZVSL should accompany this 

Modified: PluggableAuthService/branches/1.4/LICENSE.txt
===================================================================
--- PluggableAuthService/branches/1.4/LICENSE.txt	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/LICENSE.txt	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,54 +1,44 @@
 Zope Public License (ZPL) Version 2.1
 
-A copyright notice accompanies this license document that
-identifies the copyright holders.
+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
-Foundation (FSF).
+This license has been certified as open source. It has also been designated as
+GPL compatible by the Free Software Foundation (FSF).
 
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the
-following conditions are met:
+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
-   accompanying 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 accompanying
-   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. Names of the copyright holders must not be used to
-   endorse or promote products derived from this software
-   without prior written permission from the copyright
-   holders.
+3. Names of the copyright holders must not be used to endorse or promote
+products derived from this software 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 the copyright
-   holders. Use of them is covered by separate agreement
-   with 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 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
-   the files and the date of any change.
+5. If any files are modified, you must cause the modified files to carry
+prominent notices stating that you changed the files and the date of any
+change.
 
 Disclaimer
 
-  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 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;
-  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.
-
+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 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; 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.

Modified: PluggableAuthService/branches/1.4/PluggableAuthService.py
===================================================================
--- PluggableAuthService/branches/1.4/PluggableAuthService.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/PluggableAuthService.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/PropertiedUser.py
===================================================================
--- PluggableAuthService/branches/1.4/PropertiedUser.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/PropertiedUser.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/UserPropertySheet.py
===================================================================
--- PluggableAuthService/branches/1.4/UserPropertySheet.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/UserPropertySheet.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/__init__.py
===================================================================
--- PluggableAuthService/branches/1.4/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/exportimport.py
===================================================================
--- PluggableAuthService/branches/1.4/exportimport.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/exportimport.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2005 Zope Foundation and Contributors.
 #
 # 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.

Modified: PluggableAuthService/branches/1.4/interfaces/__init__.py
===================================================================
--- PluggableAuthService/branches/1.4/interfaces/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/interfaces/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/interfaces/authservice.py
===================================================================
--- PluggableAuthService/branches/1.4/interfaces/authservice.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/interfaces/authservice.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/interfaces/plugins.py
===================================================================
--- PluggableAuthService/branches/1.4/interfaces/plugins.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/interfaces/plugins.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/interfaces/propertysheets.py
===================================================================
--- PluggableAuthService/branches/1.4/interfaces/propertysheets.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/interfaces/propertysheets.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/interfaces/request.py
===================================================================
--- PluggableAuthService/branches/1.4/interfaces/request.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/interfaces/request.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/permissions.py
===================================================================
--- PluggableAuthService/branches/1.4/permissions.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/permissions.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/BasePlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/BasePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/BasePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/ChallengeProtocolChooser.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/ChallengeProtocolChooser.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/ChallengeProtocolChooser.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/CookieAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/DelegatingMultiPlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/DelegatingMultiPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/DelegatingMultiPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/DomainAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/DomainAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/DomainAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/DynamicGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/DynamicGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/DynamicGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/HTTPBasicAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/HTTPBasicAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/HTTPBasicAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/InlineAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/InlineAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/InlineAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/LocalRolePlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/LocalRolePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/LocalRolePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/RecursiveGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/RecursiveGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/RecursiveGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/RequestTypeSniffer.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/RequestTypeSniffer.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/RequestTypeSniffer.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/ScriptablePlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/ScriptablePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/ScriptablePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/SearchPrincipalsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/SearchPrincipalsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/SearchPrincipalsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/SessionAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/SessionAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/SessionAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/ZODBGroupManager.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/ZODBGroupManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/ZODBGroupManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/ZODBRoleManager.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/ZODBRoleManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/ZODBRoleManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/ZODBUserManager.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/ZODBUserManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/ZODBUserManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/__init__.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/exportimport.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/exportimport.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/exportimport.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2005 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/__init__.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/helpers.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/helpers.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/helpers.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_ChallengeProtocolChooser.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_ChallengeProtocolChooser.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_ChallengeProtocolChooser.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_CookieAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_CookieAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_CookieAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_DomainAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_DomainAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_DomainAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_DynamicGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_DynamicGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_DynamicGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_HTTPBasicAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_HTTPBasicAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_HTTPBasicAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_InlineAuthHelper.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_InlineAuthHelper.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_InlineAuthHelper.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_LocalRolePlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_LocalRolePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_LocalRolePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_RecursiveGroupsPlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_RecursiveGroupsPlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_RecursiveGroupsPlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_RequestTypeSniffer.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_RequestTypeSniffer.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_RequestTypeSniffer.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_ScriptablePlugin.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_ScriptablePlugin.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_ScriptablePlugin.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_ZODBGroupManager.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_ZODBGroupManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_ZODBGroupManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_ZODBRoleManager.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_ZODBRoleManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_ZODBRoleManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_ZODBUserManager.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_ZODBUserManager.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_ZODBUserManager.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_doctests.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_doctests.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_doctests.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/plugins/tests/test_exportimport.py
===================================================================
--- PluggableAuthService/branches/1.4/plugins/tests/test_exportimport.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/plugins/tests/test_exportimport.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2005 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/__init__.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/__init__.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/__init__.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/conformance.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/conformance.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/conformance.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/test_Caching.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/test_Caching.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/test_Caching.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/test_PluggableAuthService.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/test_PluggableAuthService.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/test_PluggableAuthService.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/test_PropertiedUser.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/test_PropertiedUser.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/test_PropertiedUser.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/test_UserPropertySheet.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/test_UserPropertySheet.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/test_UserPropertySheet.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/test_exportimport.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/test_exportimport.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/test_exportimport.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2005 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/tests/test_utils.py
===================================================================
--- PluggableAuthService/branches/1.4/tests/test_utils.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/tests/test_utils.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2006 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: PluggableAuthService/branches/1.4/utils.py
===================================================================
--- PluggableAuthService/branches/1.4/utils.py	2010-04-08 15:16:44 UTC (rev 110646)
+++ PluggableAuthService/branches/1.4/utils.py	2010-04-08 15:26:04 UTC (rev 110647)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights
+# Copyright (c) 2001 Zope Foundation and Contributors
 # Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,



More information about the checkins mailing list