sync

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

diff --git a/CHANGES b/CHANGES
index 5bf3e082414e6590ebfa80b1c02c54c74a660c0e..8f687bd1001f7eed1d7e58ea669b98befbc0d631 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -129,12 +129,17 @@ Changes with Apache 2.1.0-dev
   [Apache 2.1.0-dev includes those bug fixes and changes with the
    Apache 2.0.xx tree as documented, and except as noted, below.]
 
-Changes with Apache 2.0.46
+Changes with Apache 2.0.47
 
   *) mod_negotiation: Introduce "prefer-language" environment variable,
      which allows to influence the negotiation process on request basis
      to prefer a certain language.  [André Malo]
 
+  *) Make mod_expires' ExpiresByType work properly, including for
+     dynamically-generated documents.  [Ken Coar]
+
+Changes with Apache 2.0.46
+
   *) Fix for mod_dav.  Call the 'can_be_activity' callback, if provided,
      when a MKACTIVITY request comes in.
      [Ben Collins-Sussman <sussman@collab.net>]
@@ -161,9 +166,6 @@ Changes with Apache 2.0.46
      now work scheme dependent and the query string will only be
      appended if supported by the particular scheme.  [André Malo]
 
-  *) Make mod_expires' ExpiresByType work properly, including for
-     dynamically-generated documents.  [Ken Coar]
-
   *) Add another check for already compressed content in mod_deflate.
      PR 19913. [Tsuyoshi SASAMOTO <nazonazo@super.win.ne.jp>]