[CMF-checkins] SVN: CMF/branches/2.0/ Conform to repository policy.

Wed Apr 7 12:08:23 EDT 2010

Log message for revision 110586:
  Conform to repository policy.

Changed:
  U   CMF/branches/2.0/CMFActionIcons/ActionIconsTool.py
  U   CMF/branches/2.0/CMFActionIcons/__init__.py
  U   CMF/branches/2.0/CMFActionIcons/exportimport.py
  U   CMF/branches/2.0/CMFActionIcons/permissions.py
  U   CMF/branches/2.0/CMFActionIcons/standard_mappings.py
  U   CMF/branches/2.0/CMFActionIcons/tests/__init__.py
  U   CMF/branches/2.0/CMFActionIcons/tests/test_ActionIconsTool.py
  U   CMF/branches/2.0/CMFActionIcons/tests/test_exportimport.py
  U   CMF/branches/2.0/CMFCalendar/CalendarTool.py
  U   CMF/branches/2.0/CMFCalendar/Event.py
  U   CMF/branches/2.0/CMFCalendar/__init__.py
  U   CMF/branches/2.0/CMFCalendar/browser/__init__.py
  U   CMF/branches/2.0/CMFCalendar/browser/calendar.py
  U   CMF/branches/2.0/CMFCalendar/browser/event.py
  U   CMF/branches/2.0/CMFCalendar/exceptions.py
  U   CMF/branches/2.0/CMFCalendar/interfaces/__init__.py
  U   CMF/branches/2.0/CMFCalendar/interfaces/_content.py
  U   CMF/branches/2.0/CMFCalendar/interfaces/_tools.py
  U   CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot
  U   CMF/branches/2.0/CMFCalendar/permissions.py
  U   CMF/branches/2.0/CMFCalendar/setuphandlers.py
  U   CMF/branches/2.0/CMFCalendar/tests/test_Calendar.py
  U   CMF/branches/2.0/CMFCalendar/tests/test_Event.py
  U   CMF/branches/2.0/CMFCalendar/utils.py
  U   CMF/branches/2.0/CMFCore/ActionInformation.py
  U   CMF/branches/2.0/CMFCore/ActionProviderBase.py
  U   CMF/branches/2.0/CMFCore/ActionsTool.py
  U   CMF/branches/2.0/CMFCore/CMFBTreeFolder.py
  U   CMF/branches/2.0/CMFCore/CMFCatalogAware.py
  U   CMF/branches/2.0/CMFCore/CachingPolicyManager.py
  U   CMF/branches/2.0/CMFCore/CatalogTool.py
  U   CMF/branches/2.0/CMFCore/ContentTypeRegistry.py
  U   CMF/branches/2.0/CMFCore/CookieCrumbler.py
  U   CMF/branches/2.0/CMFCore/DirectoryView.py
  U   CMF/branches/2.0/CMFCore/DiscussionTool.py
  U   CMF/branches/2.0/CMFCore/DynamicType.py
  U   CMF/branches/2.0/CMFCore/Expression.py
  U   CMF/branches/2.0/CMFCore/FSDTMLMethod.py
  U   CMF/branches/2.0/CMFCore/FSFile.py
  U   CMF/branches/2.0/CMFCore/FSImage.py
  U   CMF/branches/2.0/CMFCore/FSMetadata.py
  U   CMF/branches/2.0/CMFCore/FSObject.py
  U   CMF/branches/2.0/CMFCore/FSPageTemplate.py
  U   CMF/branches/2.0/CMFCore/FSPropertiesObject.py
  U   CMF/branches/2.0/CMFCore/FSPythonScript.py
  U   CMF/branches/2.0/CMFCore/FSSTXMethod.py
  U   CMF/branches/2.0/CMFCore/FSZSQLMethod.py
  U   CMF/branches/2.0/CMFCore/MemberDataTool.py
  U   CMF/branches/2.0/CMFCore/MembershipTool.py
  U   CMF/branches/2.0/CMFCore/PortalContent.py
  U   CMF/branches/2.0/CMFCore/PortalFolder.py
  U   CMF/branches/2.0/CMFCore/PortalObject.py
  U   CMF/branches/2.0/CMFCore/RegistrationTool.py
  U   CMF/branches/2.0/CMFCore/Skinnable.py
  U   CMF/branches/2.0/CMFCore/SkinsContainer.py
  U   CMF/branches/2.0/CMFCore/SkinsTool.py
  U   CMF/branches/2.0/CMFCore/TypesTool.py
  U   CMF/branches/2.0/CMFCore/URLTool.py
  U   CMF/branches/2.0/CMFCore/UndoTool.py
  U   CMF/branches/2.0/CMFCore/WorkflowCore.py
  U   CMF/branches/2.0/CMFCore/WorkflowTool.py
  U   CMF/branches/2.0/CMFCore/__init__.py
  U   CMF/branches/2.0/CMFCore/browser/actions.py
  U   CMF/branches/2.0/CMFCore/browser/globalbrowsermenuservice.py
  U   CMF/branches/2.0/CMFCore/browser/typeinfo.py
  U   CMF/branches/2.0/CMFCore/exceptions.py
  U   CMF/branches/2.0/CMFCore/exportimport/__init__.py
  U   CMF/branches/2.0/CMFCore/exportimport/actions.py
  U   CMF/branches/2.0/CMFCore/exportimport/cachingpolicymgr.py
  U   CMF/branches/2.0/CMFCore/exportimport/catalog.py
  U   CMF/branches/2.0/CMFCore/exportimport/content.py
  U   CMF/branches/2.0/CMFCore/exportimport/contenttyperegistry.py
  U   CMF/branches/2.0/CMFCore/exportimport/cookieauth.py
  U   CMF/branches/2.0/CMFCore/exportimport/mailhost.py
  U   CMF/branches/2.0/CMFCore/exportimport/properties.py
  U   CMF/branches/2.0/CMFCore/exportimport/skins.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/__init__.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/conformance.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_actions.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_cachingpolicymgr.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_catalog.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_content.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_contenttyperegistry.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_cookieauth.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_mailhost.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_properties.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_skins.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_typeinfo.py
  U   CMF/branches/2.0/CMFCore/exportimport/tests/test_workflow.py
  U   CMF/branches/2.0/CMFCore/exportimport/typeinfo.py
  U   CMF/branches/2.0/CMFCore/exportimport/workflow.py
  U   CMF/branches/2.0/CMFCore/fiveactionstool.py
  U   CMF/branches/2.0/CMFCore/interfaces/CachingPolicyManager.py
  U   CMF/branches/2.0/CMFCore/interfaces/ContentTypeRegistry.py
  U   CMF/branches/2.0/CMFCore/interfaces/Contentish.py
  U   CMF/branches/2.0/CMFCore/interfaces/Discussions.py
  U   CMF/branches/2.0/CMFCore/interfaces/DublinCore.py
  U   CMF/branches/2.0/CMFCore/interfaces/Dynamic.py
  U   CMF/branches/2.0/CMFCore/interfaces/Folderish.py
  U   CMF/branches/2.0/CMFCore/interfaces/IOpaqueItems.py
  U   CMF/branches/2.0/CMFCore/interfaces/Syndicatable.py
  U   CMF/branches/2.0/CMFCore/interfaces/__init__.py
  U   CMF/branches/2.0/CMFCore/interfaces/_content.py
  U   CMF/branches/2.0/CMFCore/interfaces/_tools.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_actions.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_catalog.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_discussion.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_memberdata.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_membership.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_metadata.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_properties.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_registration.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_skins.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_types.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_undo.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_url.py
  U   CMF/branches/2.0/CMFCore/interfaces/portal_workflow.py
  U   CMF/branches/2.0/CMFCore/permissions.py
  U   CMF/branches/2.0/CMFCore/tests/base/dummy.py
  U   CMF/branches/2.0/CMFCore/tests/base/security.py
  U   CMF/branches/2.0/CMFCore/tests/base/utils.py
  U   CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py
  U   CMF/branches/2.0/CMFCore/tests/test_ActionProviderBase.py
  U   CMF/branches/2.0/CMFCore/tests/test_ActionsTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_CMFBTreeFolder.py
  U   CMF/branches/2.0/CMFCore/tests/test_CMFCatalogAware.py
  U   CMF/branches/2.0/CMFCore/tests/test_CachingPolicyManager.py
  U   CMF/branches/2.0/CMFCore/tests/test_CatalogTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_ContentTypeRegistry.py
  U   CMF/branches/2.0/CMFCore/tests/test_CookieCrumbler.py
  U   CMF/branches/2.0/CMFCore/tests/test_DiscussionTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_DynamicType.py
  U   CMF/branches/2.0/CMFCore/tests/test_Expression.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSDTMLMethod.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSFile.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSImage.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSMetadata.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSPageTemplate.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSPythonScript.py
  U   CMF/branches/2.0/CMFCore/tests/test_FSSecurity.py
  U   CMF/branches/2.0/CMFCore/tests/test_MemberDataTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_MembershipTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_OpaqueItems.py
  U   CMF/branches/2.0/CMFCore/tests/test_PortalContent.py
  U   CMF/branches/2.0/CMFCore/tests/test_PortalFolder.py
  U   CMF/branches/2.0/CMFCore/tests/test_RegistrationTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_SkinsTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_TypesTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_URLTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_UndoTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_WorkflowTool.py
  U   CMF/branches/2.0/CMFCore/tests/test_fiveactionstool.py
  U   CMF/branches/2.0/CMFCore/utils.py
  U   CMF/branches/2.0/CMFDefault/DefaultWorkflow.py
  U   CMF/branches/2.0/CMFDefault/DiscussionItem.py
  U   CMF/branches/2.0/CMFDefault/DiscussionTool.py
  U   CMF/branches/2.0/CMFDefault/Document.py
  U   CMF/branches/2.0/CMFDefault/DublinCore.py
  U   CMF/branches/2.0/CMFDefault/Extensions/Upgrade.py
  U   CMF/branches/2.0/CMFDefault/Favorite.py
  U   CMF/branches/2.0/CMFDefault/File.py
  U   CMF/branches/2.0/CMFDefault/Image.py
  U   CMF/branches/2.0/CMFDefault/Link.py
  U   CMF/branches/2.0/CMFDefault/MembershipTool.py
  U   CMF/branches/2.0/CMFDefault/MetadataTool.py
  U   CMF/branches/2.0/CMFDefault/NewsItem.py
  U   CMF/branches/2.0/CMFDefault/Portal.py
  U   CMF/branches/2.0/CMFDefault/PropertiesTool.py
  U   CMF/branches/2.0/CMFDefault/RegistrationTool.py
  U   CMF/branches/2.0/CMFDefault/SkinnedFolder.py
  U   CMF/branches/2.0/CMFDefault/SyndicationTool.py
  U   CMF/branches/2.0/CMFDefault/URLTool.py
  U   CMF/branches/2.0/CMFDefault/__init__.py
  U   CMF/branches/2.0/CMFDefault/browser/__init__.py
  U   CMF/branches/2.0/CMFDefault/browser/document.py
  U   CMF/branches/2.0/CMFDefault/browser/folder.py
  U   CMF/branches/2.0/CMFDefault/browser/link.py
  U   CMF/branches/2.0/CMFDefault/browser/metadata.py
  U   CMF/branches/2.0/CMFDefault/browser/newsitem.py
  U   CMF/branches/2.0/CMFDefault/browser/tests.py
  U   CMF/branches/2.0/CMFDefault/browser/utils.py
  U   CMF/branches/2.0/CMFDefault/exceptions.py
  U   CMF/branches/2.0/CMFDefault/factory.py
  U   CMF/branches/2.0/CMFDefault/interfaces/Document.py
  U   CMF/branches/2.0/CMFDefault/interfaces/__init__.py
  U   CMF/branches/2.0/CMFDefault/interfaces/_content.py
  U   CMF/branches/2.0/CMFDefault/interfaces/_tools.py
  U   CMF/branches/2.0/CMFDefault/interfaces/portal_membership.py
  U   CMF/branches/2.0/CMFDefault/locales/cmf_default.pot
  U   CMF/branches/2.0/CMFDefault/setuphandlers.py
  U   CMF/branches/2.0/CMFDefault/tests/common.py
  U   CMF/branches/2.0/CMFDefault/tests/test_DefaultWorkflow.py
  U   CMF/branches/2.0/CMFDefault/tests/test_DiscussionReply.py
  U   CMF/branches/2.0/CMFDefault/tests/test_DiscussionTool.py
  U   CMF/branches/2.0/CMFDefault/tests/test_Discussions.py
  U   CMF/branches/2.0/CMFDefault/tests/test_Document.py
  U   CMF/branches/2.0/CMFDefault/tests/test_DublinCore.py
  U   CMF/branches/2.0/CMFDefault/tests/test_Favorite.py
  U   CMF/branches/2.0/CMFDefault/tests/test_File.py
  U   CMF/branches/2.0/CMFDefault/tests/test_Image.py
  U   CMF/branches/2.0/CMFDefault/tests/test_Link.py
  U   CMF/branches/2.0/CMFDefault/tests/test_MembershipTool.py
  U   CMF/branches/2.0/CMFDefault/tests/test_MetadataTool.py
  U   CMF/branches/2.0/CMFDefault/tests/test_NewsItem.py
  U   CMF/branches/2.0/CMFDefault/tests/test_Portal.py
  U   CMF/branches/2.0/CMFDefault/tests/test_PropertiesTool.py
  U   CMF/branches/2.0/CMFDefault/tests/test_RegistrationTool.py
  U   CMF/branches/2.0/CMFDefault/tests/test_SyndicationTool.py
  U   CMF/branches/2.0/CMFDefault/tests/test_join.py
  U   CMF/branches/2.0/CMFDefault/tests/test_utils.py
  U   CMF/branches/2.0/CMFDefault/utils.py
  U   CMF/branches/2.0/CMFTopic/AbstractCriterion.py
  U   CMF/branches/2.0/CMFTopic/DateCriteria.py
  U   CMF/branches/2.0/CMFTopic/ListCriterion.py
  U   CMF/branches/2.0/CMFTopic/SimpleIntCriterion.py
  U   CMF/branches/2.0/CMFTopic/SimpleStringCriterion.py
  U   CMF/branches/2.0/CMFTopic/SortCriterion.py
  U   CMF/branches/2.0/CMFTopic/Topic.py
  U   CMF/branches/2.0/CMFTopic/__init__.py
  U   CMF/branches/2.0/CMFTopic/exportimport.py
  U   CMF/branches/2.0/CMFTopic/interfaces/Criterion.py
  U   CMF/branches/2.0/CMFTopic/interfaces/__init__.py
  U   CMF/branches/2.0/CMFTopic/permissions.py
  U   CMF/branches/2.0/CMFTopic/tests/common.py
  U   CMF/branches/2.0/CMFTopic/tests/test_DateC.py
  U   CMF/branches/2.0/CMFTopic/tests/test_ListC.py
  U   CMF/branches/2.0/CMFTopic/tests/test_SIC.py
  U   CMF/branches/2.0/CMFTopic/tests/test_SSC.py
  U   CMF/branches/2.0/CMFTopic/tests/test_SortC.py
  U   CMF/branches/2.0/CMFTopic/tests/test_Topic.py
  U   CMF/branches/2.0/CMFTopic/tests/test_exportimport.py
  U   CMF/branches/2.0/CMFUid/UniqueIdAnnotationTool.py
  U   CMF/branches/2.0/CMFUid/UniqueIdGeneratorTool.py
  U   CMF/branches/2.0/CMFUid/UniqueIdHandlerTool.py
  U   CMF/branches/2.0/CMFUid/__init__.py
  U   CMF/branches/2.0/CMFUid/interfaces.py
  U   CMF/branches/2.0/CMFUid/tests/test_uidannotation.py
  U   CMF/branches/2.0/CMFUid/tests/test_uidgeneration.py
  U   CMF/branches/2.0/CMFUid/tests/test_uidhandling.py
  U   CMF/branches/2.0/COPYRIGHT.txt
  U   CMF/branches/2.0/DCWorkflow/ContainerTab.py
  U   CMF/branches/2.0/DCWorkflow/DCWorkflow.py
  U   CMF/branches/2.0/DCWorkflow/Expression.py
  U   CMF/branches/2.0/DCWorkflow/Extensions/test_method.py
  U   CMF/branches/2.0/DCWorkflow/Guard.py
  U   CMF/branches/2.0/DCWorkflow/Scripts.py
  U   CMF/branches/2.0/DCWorkflow/States.py
  U   CMF/branches/2.0/DCWorkflow/Transitions.py
  U   CMF/branches/2.0/DCWorkflow/Variables.py
  U   CMF/branches/2.0/DCWorkflow/WorkflowUIMixin.py
  U   CMF/branches/2.0/DCWorkflow/Worklists.py
  U   CMF/branches/2.0/DCWorkflow/__init__.py
  U   CMF/branches/2.0/DCWorkflow/browser/__init__.py
  U   CMF/branches/2.0/DCWorkflow/browser/workflow.py
  U   CMF/branches/2.0/DCWorkflow/exportimport.py
  U   CMF/branches/2.0/DCWorkflow/interfaces.py
  U   CMF/branches/2.0/DCWorkflow/tests/test_DCWorkflow.py
  U   CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py
  U   CMF/branches/2.0/DCWorkflow/tests/test_guard.py
  U   CMF/branches/2.0/DCWorkflow/tests/test_roles.py
  U   CMF/branches/2.0/DCWorkflow/utils.py
  U   CMF/branches/2.0/LICENSE.txt
  U   CMF/branches/2.0/i18nextract.py

-=-
Modified: CMF/branches/2.0/CMFActionIcons/ActionIconsTool.py
===================================================================

--- CMF/branches/2.0/CMFActionIcons/ActionIconsTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/ActionIconsTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFActionIcons/__init__.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFActionIcons/exportimport.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/exportimport.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/exportimport.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFActionIcons/permissions.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/permissions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/permissions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFActionIcons/standard_mappings.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/standard_mappings.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/standard_mappings.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFActionIcons/tests/__init__.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/tests/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/tests/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFActionIcons/tests/test_ActionIconsTool.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/tests/test_ActionIconsTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/tests/test_ActionIconsTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFActionIcons/tests/test_exportimport.py
===================================================================
--- CMF/branches/2.0/CMFActionIcons/tests/test_exportimport.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFActionIcons/tests/test_exportimport.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCalendar/CalendarTool.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/CalendarTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/CalendarTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCalendar/Event.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/Event.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/Event.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCalendar/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCalendar/browser/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/browser/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/browser/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFCalendar/browser/calendar.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/browser/calendar.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/browser/calendar.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFCalendar/browser/event.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/browser/event.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/browser/event.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFCalendar/exceptions.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/exceptions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/exceptions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCalendar/interfaces/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/interfaces/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/interfaces/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFCalendar/interfaces/_content.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/interfaces/_content.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/interfaces/_content.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCalendar/interfaces/_tools.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/interfaces/_tools.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/interfaces/_tools.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot
===================================================================
--- CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/locales/cmf_calendar.pot	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFCalendar/permissions.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/permissions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/permissions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCalendar/setuphandlers.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/setuphandlers.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/setuphandlers.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCalendar/tests/test_Calendar.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/tests/test_Calendar.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/tests/test_Calendar.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCalendar/tests/test_Event.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/tests/test_Event.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/tests/test_Event.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCalendar/utils.py
===================================================================
--- CMF/branches/2.0/CMFCalendar/utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCalendar/utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/ActionInformation.py
===================================================================
--- CMF/branches/2.0/CMFCore/ActionInformation.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/ActionInformation.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/ActionProviderBase.py
===================================================================
--- CMF/branches/2.0/CMFCore/ActionProviderBase.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/ActionProviderBase.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/ActionsTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/ActionsTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/ActionsTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/CMFBTreeFolder.py
===================================================================
--- CMF/branches/2.0/CMFCore/CMFBTreeFolder.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/CMFBTreeFolder.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: CMF/branches/2.0/CMFCore/CMFCatalogAware.py
===================================================================
--- CMF/branches/2.0/CMFCore/CMFCatalogAware.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/CMFCatalogAware.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/CachingPolicyManager.py
===================================================================
--- CMF/branches/2.0/CMFCore/CachingPolicyManager.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/CachingPolicyManager.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/CatalogTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/CatalogTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/CatalogTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/ContentTypeRegistry.py
===================================================================
--- CMF/branches/2.0/CMFCore/ContentTypeRegistry.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/ContentTypeRegistry.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/CookieCrumbler.py
===================================================================
--- CMF/branches/2.0/CMFCore/CookieCrumbler.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/CookieCrumbler.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/DirectoryView.py
===================================================================
--- CMF/branches/2.0/CMFCore/DirectoryView.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/DirectoryView.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/DiscussionTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/DiscussionTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/DiscussionTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/DynamicType.py
===================================================================
--- CMF/branches/2.0/CMFCore/DynamicType.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/DynamicType.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/Expression.py
===================================================================
--- CMF/branches/2.0/CMFCore/Expression.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/Expression.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSDTMLMethod.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSDTMLMethod.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSDTMLMethod.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSFile.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSFile.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSFile.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSImage.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSImage.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSImage.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSMetadata.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSMetadata.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSMetadata.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFCore/FSObject.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSObject.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSObject.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSPageTemplate.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSPageTemplate.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSPageTemplate.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSPropertiesObject.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSPropertiesObject.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSPropertiesObject.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSPythonScript.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSPythonScript.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSPythonScript.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSSTXMethod.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSSTXMethod.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSSTXMethod.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/FSZSQLMethod.py
===================================================================
--- CMF/branches/2.0/CMFCore/FSZSQLMethod.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/FSZSQLMethod.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/MemberDataTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/MemberDataTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/MemberDataTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/MembershipTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/MembershipTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/MembershipTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/PortalContent.py
===================================================================
--- CMF/branches/2.0/CMFCore/PortalContent.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/PortalContent.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/PortalFolder.py
===================================================================
--- CMF/branches/2.0/CMFCore/PortalFolder.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/PortalFolder.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/PortalObject.py
===================================================================
--- CMF/branches/2.0/CMFCore/PortalObject.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/PortalObject.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/RegistrationTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/RegistrationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/RegistrationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/Skinnable.py
===================================================================
--- CMF/branches/2.0/CMFCore/Skinnable.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/Skinnable.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/SkinsContainer.py
===================================================================
--- CMF/branches/2.0/CMFCore/SkinsContainer.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/SkinsContainer.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/SkinsTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/SkinsTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/SkinsTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/TypesTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/TypesTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/TypesTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/URLTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/URLTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/URLTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/UndoTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/UndoTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/UndoTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/WorkflowCore.py
===================================================================
--- CMF/branches/2.0/CMFCore/WorkflowCore.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/WorkflowCore.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/WorkflowTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/WorkflowTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/WorkflowTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCore/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/browser/actions.py
===================================================================
--- CMF/branches/2.0/CMFCore/browser/actions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/browser/actions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/browser/globalbrowsermenuservice.py
===================================================================
--- CMF/branches/2.0/CMFCore/browser/globalbrowsermenuservice.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/browser/globalbrowsermenuservice.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,

Modified: CMF/branches/2.0/CMFCore/browser/typeinfo.py
===================================================================
--- CMF/branches/2.0/CMFCore/browser/typeinfo.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/browser/typeinfo.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exceptions.py
===================================================================
--- CMF/branches/2.0/CMFCore/exceptions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exceptions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFCore/exportimport/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/actions.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/actions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/actions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/cachingpolicymgr.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/cachingpolicymgr.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/cachingpolicymgr.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/catalog.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/catalog.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/catalog.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/content.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/content.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/content.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/contenttyperegistry.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/contenttyperegistry.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/contenttyperegistry.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/cookieauth.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/cookieauth.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/cookieauth.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/mailhost.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/mailhost.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/mailhost.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/properties.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/properties.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/properties.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/skins.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/skins.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/skins.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/conformance.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/conformance.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/conformance.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_actions.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_actions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_actions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_cachingpolicymgr.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_cachingpolicymgr.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_cachingpolicymgr.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_catalog.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_catalog.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_catalog.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_content.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_content.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_content.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_contenttyperegistry.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_contenttyperegistry.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_contenttyperegistry.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_cookieauth.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_cookieauth.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_cookieauth.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_mailhost.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_mailhost.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_mailhost.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_properties.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_properties.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_properties.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_skins.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_skins.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_skins.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_typeinfo.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_typeinfo.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_typeinfo.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/tests/test_workflow.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/tests/test_workflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/tests/test_workflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/typeinfo.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/typeinfo.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/typeinfo.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/exportimport/workflow.py
===================================================================
--- CMF/branches/2.0/CMFCore/exportimport/workflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/exportimport/workflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/fiveactionstool.py
===================================================================
--- CMF/branches/2.0/CMFCore/fiveactionstool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/fiveactionstool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/interfaces/CachingPolicyManager.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/CachingPolicyManager.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/CachingPolicyManager.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/ContentTypeRegistry.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/ContentTypeRegistry.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/ContentTypeRegistry.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/Contentish.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/Contentish.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/Contentish.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/Discussions.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/Discussions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/Discussions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/DublinCore.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/DublinCore.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/DublinCore.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/Dynamic.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/Dynamic.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/Dynamic.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/Folderish.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/Folderish.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/Folderish.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFCore/interfaces/IOpaqueItems.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/IOpaqueItems.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/IOpaqueItems.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFCore/interfaces/Syndicatable.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/Syndicatable.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/Syndicatable.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/__init__.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/interfaces/_content.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/_content.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/_content.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/interfaces/_tools.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/_tools.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/_tools.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/interfaces/portal_actions.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_actions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_actions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_catalog.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_catalog.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_catalog.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_discussion.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_discussion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_discussion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_memberdata.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_memberdata.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_memberdata.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_membership.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_membership.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_membership.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_metadata.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_metadata.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_metadata.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_properties.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_properties.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_properties.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_registration.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_registration.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_registration.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_skins.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_skins.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_skins.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_types.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_types.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_types.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_undo.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_undo.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_undo.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/interfaces/portal_url.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_url.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_url.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/interfaces/portal_workflow.py
===================================================================
--- CMF/branches/2.0/CMFCore/interfaces/portal_workflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/interfaces/portal_workflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/permissions.py
===================================================================
--- CMF/branches/2.0/CMFCore/permissions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/permissions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/tests/base/dummy.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/base/dummy.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/base/dummy.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/base/security.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/base/security.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/base/security.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/base/utils.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/base/utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/base/utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_ActionInformation.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_ActionProviderBase.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_ActionProviderBase.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_ActionProviderBase.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_ActionsTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_ActionsTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_ActionsTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_CMFBTreeFolder.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_CMFBTreeFolder.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_CMFBTreeFolder.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/tests/test_CMFCatalogAware.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_CMFCatalogAware.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_CMFCatalogAware.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/tests/test_CachingPolicyManager.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_CachingPolicyManager.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_CachingPolicyManager.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_CatalogTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_CatalogTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_CatalogTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/tests/test_ContentTypeRegistry.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_ContentTypeRegistry.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_ContentTypeRegistry.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_CookieCrumbler.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_CookieCrumbler.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/tests/test_DiscussionTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_DiscussionTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_DiscussionTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_DynamicType.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_DynamicType.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_DynamicType.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_Expression.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_Expression.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_Expression.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSDTMLMethod.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSDTMLMethod.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSDTMLMethod.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSFile.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSFile.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSFile.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSImage.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSImage.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSImage.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSMetadata.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSMetadata.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSMetadata.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSPageTemplate.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSPageTemplate.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSPageTemplate.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSPythonScript.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSPythonScript.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSPythonScript.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_FSSecurity.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_FSSecurity.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_FSSecurity.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_MemberDataTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_MemberDataTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_MemberDataTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_MembershipTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_MembershipTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_MembershipTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_OpaqueItems.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_OpaqueItems.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_OpaqueItems.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_PortalContent.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_PortalContent.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_PortalContent.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_PortalFolder.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_PortalFolder.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_PortalFolder.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/tests/test_RegistrationTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_RegistrationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_RegistrationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_SkinsTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_SkinsTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_SkinsTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_TypesTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_TypesTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_TypesTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFCore/tests/test_URLTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_URLTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_URLTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_UndoTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_UndoTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_UndoTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_WorkflowTool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_WorkflowTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_WorkflowTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFCore/tests/test_fiveactionstool.py
===================================================================
--- CMF/branches/2.0/CMFCore/tests/test_fiveactionstool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/tests/test_fiveactionstool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFCore/utils.py
===================================================================
--- CMF/branches/2.0/CMFCore/utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFCore/utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/DefaultWorkflow.py
===================================================================
--- CMF/branches/2.0/CMFDefault/DefaultWorkflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/DefaultWorkflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/DiscussionItem.py
===================================================================
--- CMF/branches/2.0/CMFDefault/DiscussionItem.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/DiscussionItem.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/DiscussionTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/DiscussionTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/DiscussionTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/Document.py
===================================================================
--- CMF/branches/2.0/CMFDefault/Document.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/Document.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/DublinCore.py
===================================================================
--- CMF/branches/2.0/CMFDefault/DublinCore.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/DublinCore.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/Extensions/Upgrade.py
===================================================================
--- CMF/branches/2.0/CMFDefault/Extensions/Upgrade.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/Extensions/Upgrade.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/Favorite.py
===================================================================
--- CMF/branches/2.0/CMFDefault/Favorite.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/Favorite.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/File.py
===================================================================
--- CMF/branches/2.0/CMFDefault/File.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/File.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/Image.py
===================================================================
--- CMF/branches/2.0/CMFDefault/Image.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/Image.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/Link.py
===================================================================
--- CMF/branches/2.0/CMFDefault/Link.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/Link.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/MembershipTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/MembershipTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/MembershipTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/MetadataTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/MetadataTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/MetadataTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/NewsItem.py
===================================================================
--- CMF/branches/2.0/CMFDefault/NewsItem.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/NewsItem.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/Portal.py
===================================================================
--- CMF/branches/2.0/CMFDefault/Portal.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/Portal.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/PropertiesTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/PropertiesTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/PropertiesTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/RegistrationTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/RegistrationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/RegistrationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/SkinnedFolder.py
===================================================================
--- CMF/branches/2.0/CMFDefault/SkinnedFolder.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/SkinnedFolder.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/SyndicationTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/SyndicationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/SyndicationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/URLTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/URLTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/URLTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/__init__.py
===================================================================
--- CMF/branches/2.0/CMFDefault/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/browser/__init__.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/document.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/document.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/document.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/folder.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/folder.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/folder.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/link.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/link.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/link.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/metadata.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/metadata.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/metadata.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/newsitem.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/newsitem.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/newsitem.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/tests.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/tests.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/tests.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/browser/utils.py
===================================================================
--- CMF/branches/2.0/CMFDefault/browser/utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/browser/utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/exceptions.py
===================================================================
--- CMF/branches/2.0/CMFDefault/exceptions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/exceptions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFDefault/factory.py
===================================================================
--- CMF/branches/2.0/CMFDefault/factory.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/factory.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFDefault/interfaces/Document.py
===================================================================
--- CMF/branches/2.0/CMFDefault/interfaces/Document.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/interfaces/Document.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFDefault/interfaces/__init__.py
===================================================================
--- CMF/branches/2.0/CMFDefault/interfaces/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/interfaces/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFDefault/interfaces/_content.py
===================================================================
--- CMF/branches/2.0/CMFDefault/interfaces/_content.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/interfaces/_content.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFDefault/interfaces/_tools.py
===================================================================
--- CMF/branches/2.0/CMFDefault/interfaces/_tools.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/interfaces/_tools.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFDefault/interfaces/portal_membership.py
===================================================================
--- CMF/branches/2.0/CMFDefault/interfaces/portal_membership.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/interfaces/portal_membership.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/CMFDefault/locales/cmf_default.pot
===================================================================
--- CMF/branches/2.0/CMFDefault/locales/cmf_default.pot	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/locales/cmf_default.pot	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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: CMF/branches/2.0/CMFDefault/setuphandlers.py
===================================================================
--- CMF/branches/2.0/CMFDefault/setuphandlers.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/setuphandlers.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFDefault/tests/common.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/common.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/common.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFDefault/tests/test_DefaultWorkflow.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_DefaultWorkflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_DefaultWorkflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_DiscussionReply.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_DiscussionReply.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_DiscussionReply.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_DiscussionTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_DiscussionTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_DiscussionTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_Discussions.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_Discussions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_Discussions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_Document.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_Document.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_Document.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_DublinCore.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_DublinCore.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_DublinCore.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_Favorite.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_Favorite.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_Favorite.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_File.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_File.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_File.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFDefault/tests/test_Image.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_Image.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_Image.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_Link.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_Link.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_Link.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_MembershipTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_MembershipTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_MembershipTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_MetadataTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_MetadataTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_MetadataTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_NewsItem.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_NewsItem.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_NewsItem.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_Portal.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_Portal.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_Portal.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_PropertiesTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_PropertiesTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_PropertiesTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_RegistrationTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_RegistrationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_RegistrationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/tests/test_SyndicationTool.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_SyndicationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_SyndicationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFDefault/tests/test_join.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_join.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_join.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFDefault/tests/test_utils.py
===================================================================
--- CMF/branches/2.0/CMFDefault/tests/test_utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/tests/test_utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2002 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2002 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: CMF/branches/2.0/CMFDefault/utils.py
===================================================================
--- CMF/branches/2.0/CMFDefault/utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFDefault/utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/AbstractCriterion.py
===================================================================
--- CMF/branches/2.0/CMFTopic/AbstractCriterion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/AbstractCriterion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/DateCriteria.py
===================================================================
--- CMF/branches/2.0/CMFTopic/DateCriteria.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/DateCriteria.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/ListCriterion.py
===================================================================
--- CMF/branches/2.0/CMFTopic/ListCriterion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/ListCriterion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/SimpleIntCriterion.py
===================================================================
--- CMF/branches/2.0/CMFTopic/SimpleIntCriterion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/SimpleIntCriterion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/SimpleStringCriterion.py
===================================================================
--- CMF/branches/2.0/CMFTopic/SimpleStringCriterion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/SimpleStringCriterion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/SortCriterion.py
===================================================================
--- CMF/branches/2.0/CMFTopic/SortCriterion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/SortCriterion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/Topic.py
===================================================================
--- CMF/branches/2.0/CMFTopic/Topic.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/Topic.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/__init__.py
===================================================================
--- CMF/branches/2.0/CMFTopic/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/exportimport.py
===================================================================
--- CMF/branches/2.0/CMFTopic/exportimport.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/exportimport.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFTopic/interfaces/Criterion.py
===================================================================
--- CMF/branches/2.0/CMFTopic/interfaces/Criterion.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/interfaces/Criterion.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/interfaces/__init__.py
===================================================================
--- CMF/branches/2.0/CMFTopic/interfaces/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/interfaces/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/permissions.py
===================================================================
--- CMF/branches/2.0/CMFTopic/permissions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/permissions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/common.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/common.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/common.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFTopic/tests/test_DateC.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_DateC.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_DateC.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/test_ListC.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_ListC.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_ListC.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/test_SIC.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_SIC.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_SIC.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/test_SSC.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_SSC.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_SSC.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/test_SortC.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_SortC.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_SortC.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/test_Topic.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_Topic.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_Topic.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/CMFTopic/tests/test_exportimport.py
===================================================================
--- CMF/branches/2.0/CMFTopic/tests/test_exportimport.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFTopic/tests/test_exportimport.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/CMFUid/UniqueIdAnnotationTool.py
===================================================================
--- CMF/branches/2.0/CMFUid/UniqueIdAnnotationTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/UniqueIdAnnotationTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/UniqueIdGeneratorTool.py
===================================================================
--- CMF/branches/2.0/CMFUid/UniqueIdGeneratorTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/UniqueIdGeneratorTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/UniqueIdHandlerTool.py
===================================================================
--- CMF/branches/2.0/CMFUid/UniqueIdHandlerTool.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/UniqueIdHandlerTool.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/__init__.py
===================================================================
--- CMF/branches/2.0/CMFUid/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/interfaces.py
===================================================================
--- CMF/branches/2.0/CMFUid/interfaces.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/interfaces.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/tests/test_uidannotation.py
===================================================================
--- CMF/branches/2.0/CMFUid/tests/test_uidannotation.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/tests/test_uidannotation.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/tests/test_uidgeneration.py
===================================================================
--- CMF/branches/2.0/CMFUid/tests/test_uidgeneration.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/tests/test_uidgeneration.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/CMFUid/tests/test_uidhandling.py
===================================================================
--- CMF/branches/2.0/CMFUid/tests/test_uidhandling.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/CMFUid/tests/test_uidhandling.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/COPYRIGHT.txt
===================================================================
--- CMF/branches/2.0/COPYRIGHT.txt	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/COPYRIGHT.txt	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,9 +1 @@
-Copyright (c) 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: CMF/branches/2.0/DCWorkflow/ContainerTab.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/ContainerTab.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/ContainerTab.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/DCWorkflow.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/DCWorkflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/DCWorkflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/Expression.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Expression.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Expression.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/Extensions/test_method.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Extensions/test_method.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Extensions/test_method.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/DCWorkflow/Guard.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Guard.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Guard.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/Scripts.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Scripts.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Scripts.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/States.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/States.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/States.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/Transitions.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Transitions.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Transitions.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/Variables.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Variables.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Variables.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/WorkflowUIMixin.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/WorkflowUIMixin.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/WorkflowUIMixin.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/Worklists.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/Worklists.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/Worklists.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/__init__.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/DCWorkflow/browser/__init__.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/browser/__init__.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/browser/__init__.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/DCWorkflow/browser/workflow.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/browser/workflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/browser/workflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/DCWorkflow/exportimport.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/exportimport.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/exportimport.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/DCWorkflow/interfaces.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/interfaces.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/interfaces.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/DCWorkflow/tests/test_DCWorkflow.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/tests/test_DCWorkflow.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/tests/test_DCWorkflow.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2003 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: CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/tests/test_exportimport.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/DCWorkflow/tests/test_guard.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/tests/test_guard.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/tests/test_guard.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/DCWorkflow/tests/test_roles.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/tests/test_roles.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/tests/test_roles.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2004 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2004 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: CMF/branches/2.0/DCWorkflow/utils.py
===================================================================
--- CMF/branches/2.0/DCWorkflow/utils.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/DCWorkflow/utils.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2001 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: CMF/branches/2.0/LICENSE.txt
===================================================================
--- CMF/branches/2.0/LICENSE.txt	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/LICENSE.txt	2010-04-07 16:08:22 UTC (rev 110586)
@@ -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: CMF/branches/2.0/i18nextract.py
===================================================================
--- CMF/branches/2.0/i18nextract.py	2010-04-07 16:03:59 UTC (rev 110585)
+++ CMF/branches/2.0/i18nextract.py	2010-04-07 16:08:22 UTC (rev 110586)
@@ -1,7 +1,7 @@
 #!/usr/bin/env python2.4
 ##############################################################################
 #
-# Copyright (c) 2003 Zope Corporation and Contributors.
+# Copyright (c) 2003 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -68,7 +68,7 @@
 pot_header = '''\
 ##############################################################################
 #
-# Copyright (c) 2006 Zope Corporation and Contributors. All Rights Reserved.
+# Copyright (c) 2006 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.

