[Zope-Checkins] SVN: Zope/trunk/lib/python/Products/Five/ Merge r40380 from 2.9 branch:

[Philipp von Weitershausen]

Log message for revision 40381:
  Merge r40380 from 2.9 branch:
    update some remaining docs to their Five 1.3b5 versions.
  

Changed:
  U   Zope/trunk/lib/python/Products/Five/CHANGES.txt
  U   Zope/trunk/lib/python/Products/Five/version.txt

-=-
Modified: Zope/trunk/lib/python/Products/Five/CHANGES.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/CHANGES.txt	2005-11-26 16:20:55 UTC (rev 40380)
+++ Zope/trunk/lib/python/Products/Five/CHANGES.txt	2005-11-26 16:24:19 UTC (rev 40381)
@@ -2,40 +2,30 @@
 Five Changes
 ============
 
-Five 1.3b4 (2005-11-25)
-=======================
+Five 1.3c (unreleased)
+======================
 
+This version is also included in Zope 2.9b1.
+
 Restructuring
 -------------
 
-* Cleaned up security test.
+* (b4) Cleaned up security test.
 
-* Made Five send a ContainerModifiedEvent when appropriate.
+* (b4) Made Five send a ContainerModifiedEvent when appropriate.
 
-Five 1.3b3 (2005-11-19)
-=======================
-
-This version is also included in Zope 2.9b1.
-
 Bugfixes
 --------
 
-* Made the creation of custom skins work again.  It was broken in the
-  port to Zope 3.2.
+* (b3) Made the creation of custom skins work again.  It was broken in
+  the port to Zope 3.2.
 
-Five 1.3b2 (2005-11-10)
-=======================
+* (b2) Fixed bug that broke WebDAV access for five:defaultViewable
+  objects. The __browser_default__ now modifies only GET and POST
+  requests.
 
-Changes compared to Five 1.3b:
+* (b2) Fixed some event recursion compatibility modes.
 
-Bugfixes
---------
-
-* Fixed bug that broke WebDAV access for five:defaultViewable objects. The
-  __browser_default__ now modifies only GET and POST requests.
-
-* Fixed some event recursion compatibility modes.
-
 Five 1.3b (2005-11-02)
 ======================
 
@@ -79,6 +69,13 @@
 
 * Fixed some event recursion compatibility modes.
 
+* Fixed loops in zcml loading due to events in some cases.
+
+Restructuring
+-------------
+
+* Cleaned up security test.
+
 Five 1.2b (2005-11-02)
 ======================
 

Modified: Zope/trunk/lib/python/Products/Five/version.txt
===================================================================
--- Zope/trunk/lib/python/Products/Five/version.txt	2005-11-26 16:20:55 UTC (rev 40380)
+++ Zope/trunk/lib/python/Products/Five/version.txt	2005-11-26 16:24:19 UTC (rev 40381)
@@ -1 +1 @@
-Five 1.3b4
+Five 1.3b5