Updated CHANGES

doc/CHANGES.txt

@@ -6,6 +6,24 @@ Zope Changes
 
     Features Added
 
+      - New user management API for user folder objects was implemented.
+
+        As of Zope 2.5, manage_addUser, manage_editUser and manage_delUsers
+        form the official API for user management. The old grotesque way of
+        using manage_users is now deprecated. 
+
+        The default implementation of these API methods simply call the
+        _doXXX versions of the methods that user folder authors have already
+        implemented, which means that these APIs will work for current user
+        folder implementations without any action on the part of the author.
+
+        User folder authors that implement the new manage_XXX API can get
+        rid of the old _doXXX versions of the methods, which are no longer
+        required (we only use them if the new api is not directly implemented).
+
+        API documentation for the User Folder API was also added to
+        the help system.
+
       - Python compiler in RestrictedPython brought in sync with
         main distribution.  Made to be compatible with Python 2.2.
 
@@ -85,11 +103,9 @@ Zope Changes
         the level parameter inside a query overrides the optional 
         'level' parameter for a complete search request.
 
-<<<<<<< CHANGES.txt
       - Collector #2561: XXBucket.values() returned keys instead of values 
-=======
+
       - Fixed the API docs for user objects.
->>>>>>> 1.359
    
 
     Zope 2.4 beta 2