sync with APACHE_2_0_BRANCH

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

diff --git a/CHANGES b/CHANGES
index d1e9cf02a58e66570f8ce09a5ee88b492d1d272e..368ebf351da1b641e9743ccf354a13c74aee7fa5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -29,9 +29,6 @@ Changes with Apache 2.1.0-dev
   *) mod_logio: Account for some bytes handed to the network layer prior to
      dropped connections.  [Jeff Trawick]
 
-  *) Fix a problem with the display of empty variables ("SetEnv foo") in
-     mod_include.  PR 24734  [Markus Julen <mj zermatt.net>]
-
   *) Win32 MPM: The bucket brigades subsystem now honors the MaxMemFree setting.
      [Bill Stoddard]
 
@@ -63,9 +60,6 @@ Changes with Apache 2.1.0-dev
   *) mod_autoindex / core: Don't fail to show filenames containing
      special characters like '%'. PR 13598.  [André Malo]
 
-  *) mod_info: HTML escape configuration information so it displays 
-     correctly. PR 24232. [Thom May]
-     
   *) mod_status: Report total CPU time accurately when using a threaded
      MPM.  PR 23795.  [Jeff Trawick]
 
@@ -265,6 +259,15 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_info: HTML escape configuration information so it displays 
+     correctly. PR 24232. [Thom May]
+     
+  *) Restore the ability to add a description for directories that
+     don't contain an index file.  (Broken in 2.0.48) [André Malo]
+
+  *) Fix a problem with the display of empty variables ("SetEnv foo") in
+     mod_include.  PR 24734  [Markus Julen <mj zermatt.net>]
+
   *) mod_log_config: Log the minutes component of the timezone correctly.
      PR 23642.  [Hong-Gunn Chew <hgbug gunnet.org>]