[CMF-checkins] SVN: CMF/branches/1.6/ - remove some entries from CHANGES.txt that belonged into the 1.5 branch

[Jens Vagelpohl]

Log message for revision 41667:
  - remove some entries from CHANGES.txt that belonged into the 1.5 branch
  - re-synched HISTORY.txt with the current 1.5 branch CHANGES.txt
  

Changed:
  U   CMF/branches/1.6/CHANGES.txt
  U   CMF/branches/1.6/HISTORY.txt

-=-
Modified: CMF/branches/1.6/CHANGES.txt
===================================================================
--- CMF/branches/1.6/CHANGES.txt	2006-02-18 14:34:59 UTC (rev 41666)
+++ CMF/branches/1.6/CHANGES.txt	2006-02-18 14:51:44 UTC (rev 41667)
@@ -2,14 +2,6 @@
 
   Bug Fixes
 
-    - CMFCore.FSPythonScript: FSPythonScripts forgot to add __file__ to
-      the script globals. This broke warnings.warn() when a stacklevel
-      argument pointing into the script was passed (2).
-
-    - DCWorkflow.exportimport: Workflows managing no permissions at all 
-      could make the DCWorkflow workflow exporter fail.
-      (http://www.zope.org/Collectors/CMF/397)
-
     - Removed BBBTransaction class from CMFCore.utils
 
     - Extension profiles: Fixed import of actions, now they don't
@@ -41,7 +33,5 @@
 
     - Reordered base classes of File and Image, to allow use of super().
 
-    - Made unit tests close the request properly.
-
     - Changed TypesTool.manage_addTypeInformation method to log a warning
       instead of raise an exception if the typeinfo_name is not found.

Modified: CMF/branches/1.6/HISTORY.txt
===================================================================
--- CMF/branches/1.6/HISTORY.txt	2006-02-18 14:34:59 UTC (rev 41666)
+++ CMF/branches/1.6/HISTORY.txt	2006-02-18 14:51:44 UTC (rev 41667)
@@ -1,3 +1,62 @@
+After CMF 1.5.5
+
+  Bug Fixes
+
+    - CMFDefault.RegistrationTool: Adding single quotes to the allowed
+      characters in the local part of an email address.
+      (http://www.zope.org/Collectors/CMF/401)
+
+    - CMFCore.FSPythonScript: FSPythonScripts forgot to add __file__ to
+      the script globals. This broke warnings.warn() when a stacklevel
+      argument pointing into the script was passed (2).
+
+    - CMFSetup.workflow: Workflows managing no permissions at all could
+      make the CMFSetup workflow exporter fail.
+      (http://www.zope.org/Collectors/CMF/397)
+
+    - CMFDefault.DiscussionItem: Deleting a discussion reply would not
+      recurse and left items below the deleted reply still cataloged
+      (http://www.zope.org/Collectors/CMF/391)
+
+    - Corrected the HelpSystem documentation for DCWorkflow Guards
+      (http://www.zope.org/Collectors/CMF/394)
+
+    - CMFCore utils: Synced _checkPermission with Zope 2.8.5 code.
+      checkPermission of Zope 2.8.5 and later contains bug fixes and respects
+      proxy roles, but for backwards compatibility CMF 1.5 still needs its own
+      implementation.
+
+  Others
+
+    - Made unit tests close the request properly.
+
+    - Made cut / copy / paste tests more independent from implementation
+      details of '_verifyObjectPaste'.
+
+    - Modified several deprecation warnings to indicate point-of-use of the
+      deprecated feature.
+
+
+CMF 1.5.5 (2005/11/20)
+
+  Bug Fixes
+
+    - DefaultWorkflowDefinition: Changed meta_type to make it unique.
+      (http://www.zope.org/Collectors/CMF/298)
+
+    - CMFSetup: fixed empty attribute parsing when an encoding is
+      defined.
+
+  Others
+
+    - CMFCore: removed old backward compatibility code that slowed down
+      TypeInformation.allowType and gave PortalFolder.allowedContentTypes
+      quadratic complexity.
+
+    - Removed deprecated 'all_cmf_tests.py' and supporting 'test_all.py'
+      from products (use 'zopectl test' to run CMF tests instead).
+
+
 CMF 1.5.5-beta (2005/11/06)
 
   Bug Fixes