sync with stable branch

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

diff --git a/CHANGES b/CHANGES
index 53bdc1b8f96169cb93ec5a4cd7ad4593280a40ca..6db46db4bae3b2aee0fefc2b37cad9e39cf297ba 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,9 +14,6 @@ Changes with Apache 2.1.0-dev
   *) Log an error when requests for URIs which fail to map to a valid 
      filesystem name are rejected with 403.  [Jeff Trawick]
 
-  *) Fix mod_info to use the real config file name, not the default
-     config file name.  [Aryeh Katz <aryeh@secured-services.com>]
-
   *) Fix a couple of AIX xlc_r compiler issues in the code I just
      committed. [Paul J. Reder]
 
@@ -212,6 +209,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) Fix mod_info to use the real config file name, not the default
+     config file name.  [Aryeh Katz <aryeh@secured-services.com>]
+
   *) Set the scoreboard state to indicate logging prior to running 
      logging hooks so that server-status will show 'L' for hung loggers
      instead of 'W'.  [Jeff Trawick]