Sync with 2.2.4 changes

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

diff --git a/CHANGES b/CHANGES
index 66f8cff37ea4f20abe8f1d71e502557c0e7bf2b2..afd4b49acdfdef63f12af2cf3ce629173baa1254 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -59,9 +59,6 @@ Changes with Apache 2.3.0
 
   *) mod_proxy_fcgi: Added win32 build. [Mladen Turk]
 
-  *) Allow mod_dumpio to log at other than DEBUG levels via
-     the new DumpIOLogLevel directive. [Jim Jagielski]
-
   *) mod_disk_cache: Implement read-while-caching.
      [Niklas Edmundsson <nikke acc.umu.se>]
 
@@ -241,6 +238,9 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.4
 
+  *) Allow mod_dumpio to log at other than DEBUG levels via
+     the new DumpIOLogLevel directive. [Jim Jagielski]
+
   *) rotatelogs: Improve error message for open failures.  PR 39487.
      [Joe Orton]
 

diff --git a/docs/manual/mod/mod_dumpio.xml b/docs/manual/mod/mod_dumpio.xml
index fc51a51b0f26a693706e60c887395c386d1e8d59..47b23f8d704485a6543743810ec69966c0fe2d50 100644 (file)
--- a/docs/manual/mod/mod_dumpio.xml
+++ b/docs/manual/mod/mod_dumpio.xml
@@ -95,7 +95,7 @@ later.</compatibility>
 <syntax>DumpIOLogLevel <var>level</var></syntax>
 <default>DumpIOLogLevel debug</default>
 <contextlist><context>server config</context></contextlist>
-<compatibility>DumpIOLogLevel is only available in Apache 2.3.x and 
+<compatibility>DumpIOLogLevel is only available in Apache 2.2.4 and 
 later.</compatibility>
 
 <usage>