--- a/docs/CHANGES	Sat Sep 24 18:28:09 2005 +0000
+++ b/docs/CHANGES	Sat Sep 24 18:48:01 2005 +0000
@@ -134,6 +134,19 @@
     * added a "Despam" action to make de-spamming a wiki easy (mass revert
       bad changes done by a single author or bot). You need to be in
       cfg.superuser to use it.
+    * Enhanced table support in the DocBook formatter.
+    * Added 'moin' daemon script, that let you run moin standalone
+      server as daemon and control the server with simple command line
+      intreface: moin start | stop | restart | kill
+    * Added a "daemon" option to standalone server. Useful if you want
+      to start if at system startup.    
+    * Add 'restart' option to mointwisted script
+    * Add properties option to standalone server config. Allow
+      overriding any request property like in other server types.
+    * Add support for running behind proxy out of the box with out
+      manual url mapping.
+      See HelpOnConfiguration/IntegratingWithApache
+
 
   Internal Changes:
     * request.formatter (html) is available for actions now
@@ -146,10 +159,7 @@
       that should fix quite some IE bugs and annoyances (on Win32).
       * for enabling IE7, use cfg.hacks = { 'ie7': True }
 
-Merged from moin--main--1.3:
-
-Fixes:
-
+  Fixes:
     * Fixed a typo in xslt.py which led to a traceback instead of an
       error message in case of disabled XSLT support.
     * Fixed crash in twisted server if twisted.internet.ssl is not
@@ -158,17 +168,10 @@
       with non ascii page names.
     * Fixed wrong display of non ascii attachments names in
       RecentChanges and page revision history.
-    * Added a "daemon" option to standalone server. Useful if you want
-      to start if at system startup.    
     * Fixed a crash when trying to run standalone server on non posix os.
     * Fixed highlight of misspelled words in Check Spelling action.
     * Fixed case insensitivity problems on darwin (Mac OS X). See
       MoinMoinBugs/MacHfsPlusCaseInsensitive
-    * Added 'moin' daemon script, that let you run moin standalone
-      server as daemon and control the server with simple command line
-      intreface: moin start | stop | restart | kill
-    * Add 'restart' option to mointwisted script
-    * Enhanced table support in the DocBook formatter.
     * Added RecentChanges (only the english one) to the pages getting
       html_head_index headers
     * text_html cache files written with this code will invalidate themselves
@@ -192,14 +195,6 @@
       the user that he entered an unknown email address.
 
 
-New Features:
-
-    * Add properties option to standalone server config. Allow
-      overriding any request property like in other server types.
-    * Add support for running behind proxy out of the box with out
-      manual url mapping.
-      See HelpOnConfiguration/IntegratingWithApache
-
 Version 1.4:
     We used that version number for an internal and early development version
     for what will be called moin 2.0 at some time in the future.