sync

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

diff --git a/CHANGES b/CHANGES
index df560979be467cbe8d77bc3af4e2e35051fe71a6..7861c53431de2d3843ee619cd92e81b313435c05 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) Add another check for already compressed content in mod_deflate.
-     PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]
-
   *) Add a delete flag to htpasswd.
      [Thom May]
 
@@ -149,6 +146,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) Add another check for already compressed content in mod_deflate.
+     PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]
+
   *) Fixes for VPATH builds; copying special.mk and any future .mk files 
      from the source tree as well as the build tree (now creates a usable
      configuration for apxs), and eliminated redundant -I'nclude paths.
@@ -173,7 +173,7 @@ Changes with Apache 2.0.46
   *) mod_log_config: Add the ability to log the id of the thread 
      processing the request via new %P formats.  [Jeff Trawick]
 
-  *) Use appropriate language code for Czech (cs) and Traditional Chinese
+  *) Use appropriate language codes for Czech (cs) and Traditional Chinese
      (zh-tw) in default config files. PR 9427.  [André Malo]
 
   *) mod_auth_ldap: Use generic whitespace character class when parsing