Updated CHANGES, moved some bug fix notes into the 2.2 branch CHANGES.txt

doc/CHANGES.txt

@@ -4,21 +4,14 @@ Zope changes
   Change information for previous versions of Zope can be found in the
   file HISTORY.txt.
 
-    Zope 2.2.0
+    Zope 2.3.0
     
-      Bugs Fixed
+      Features Added
 
-        - Fixed Tutorial bug that caused win98 to crash with adding a
-          tutorial.
+	- **This is the trunk version of CHANGES.txt. Please put only 
+            new features here. Bug fixes should be fixed on both the 
+            trunk and current release branch, but the note for a bug 
+            fix should go into the CHANGES.txt of the current release 
+            branch (which is where the next bug-fix release will be 
+            made from).**
 
-        - Fixed ZService.py to avoid overwriting existing service start 
-          parameters at install time on win32.
-
-        - The deprecated alias getSize() was added back to Image and DTML
-          objects (existing products still depend on it).
-
-        - Cleaned up a DocumentTemplate namespace issue.  Fixed QuickStart.
-
-        - Removed old validation code in cDocumentTemplate.
-
-	- Minor bug in ZCatalog which prevented deletion of indexes fixed.