sync, sync (forgot one recently ...)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99969 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 3310402b220fc5c0e6295377ac289eb7b425c8c3..cca485cd15924acb2fd73e535ac154af3be58a94 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,9 +17,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: Fix LA-U variable look ahead which didn't work correctly
      in directory context. Related to PR 8493.  [André Malo]
 
-  *) Add a delete flag to htpasswd.
-     [Thom May]
-
   *) Ensure that ssl-std.conf is generated at configure time, and switch
      to using the expanded config variables to work the same as
      httpd-std.conf PR 19611
@@ -77,10 +74,6 @@ Changes with Apache 2.1.0-dev
   *) mod_rewrite: Fix some problems reporting errors with mapping
      programs (RewriteMap prg:/something).  [Jeff Trawick]
 
-  *) Fix mod_rewrite's handling of absolute URIs. The escaping routines
-     now work scheme dependent and the query string will only be
-     appended if supported by the particular scheme.  [André Malo]
-
   *) Return 413 if chunk-ext-header is too long rather than reading from
      the truncated line.  PR 15857.  [Justin Erenkrantz]
 
@@ -158,6 +151,13 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Add a delete flag to htpasswd.
+     [Thom May]
+
+  *) Fix mod_rewrite's handling of absolute URIs. The escaping routines
+     now work scheme dependent and the query string will only be
+     appended if supported by the particular scheme.  [André Malo]
+
   *) Make mod_expires' ExpiresByType work properly, including for
      dynamically-generated documents.  [Ken Coar]