backported to 2.0.49

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/CHANGES b/CHANGES
index 5d554f6534d990ece8f79ae2ca5cd897b7fb7356..4a63cb01acb395a969acc569e366b2fe8cd5c0ce 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,12 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) complain via error_log when mod_include's INCLUDES filter is
-     enabled, but the relevant Options flag allowing the filter to run
-     for the specific resource wasn't set, so that the filter won't
-     silently get skipped. next remove itself, so the warning will be
-     logged only once [Stas Bekman, Jeff Trawick, Bill Rowe]
-
   *) Clean up httpd -V output: Instead of displaying the MPM source
      directory, display the MPM name and some MPM properties.
      [Geoffrey Young <geoff apache.org>]
@@ -265,6 +259,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) complain via error_log when mod_include's INCLUDES filter is
+     enabled, but the relevant Options flag allowing the filter to run
+     for the specific resource wasn't set, so that the filter won't
+     silently get skipped. next remove itself, so the warning will be
+     logged only once [Stas Bekman, Jeff Trawick, Bill Rowe]
+
   *) mod_info: HTML escape configuration information so it displays 
      correctly. PR 24232. [Thom May]