Backport a fix to 2.0

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

diff --git a/CHANGES b/CHANGES
index e67f408b502c15bd4f4dd093f71bc776d1d6aa48..db7a761a2dfee47d0bc764efda6a23b0fb70c311 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) htpasswd: Check the processed file on validity. If a line is not empty
-     and not a comment, it must contain at least one colon. Otherwise exit
-     with error code 7. [Kris Verbeeck <Kris.Verbeeck@ubizen.com>, Thom May]
-
   *) Use appropriate language code for Czech (cs) in default config
      files. PR 9427.  [André Malo]
 
@@ -168,6 +164,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) htpasswd: Check the processed file on validity. If a line is not empty
+     and not a comment, it must contain at least one colon. Otherwise exit
+     with error code 7. [Kris Verbeeck <Kris.Verbeeck@ubizen.com>, Thom May]
+
   *) Fix a problem that caused httpd to be linked with incorrect flags
      on some platforms when mod_so was enabled by default, breaking 
      DSOs on AIX.  PR 19012  [Jeff Trawick]