For your consideration;

  the following CHANGES entries do not occur in the APACHE_2_0_BRANCH
  CHANGES file.  If you already committed them, please reflect in both
  CHANGES files.  If you would like to commit them, please do so, and
  then reflect the patches under Apache 2.0.44.

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

diff --git a/CHANGES b/CHANGES
index 5362cf91f744605d111667c08d063ab3c82ca7b1..4f74f7f9b94f83eefc51dac0209b30a5e4cac898 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,25 +2,9 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
-  *) Add version string to provider API.  [Justin Erenkrantz]
-
   *) Rewrite of aaa modules to an authn/authz model.
      [Dirk-Willem van Gulik, Justin Erenkrantz]
 
-Changes with Apache 2.0.44
-
-  *) build: './configure && make' now works without an in-tree
-     apr and apr-util. [Wilfredo Sanchez]
-
-  *) mod_negotiation: Set the appropriate mime response headers
-     (Content-Type, charset, Content-Language and Content-Encoding)
-     for negotated type-map "Body:" responses (such as the error
-     pages.)  [André Malo <nd@perlig.de>]
-
-  *) mod_log_config: Allow '%%' escaping in CustomLog format
-     strings to insert a literal, single '%'.
-     [André Malo <nd@perlig.de>]
-
   *) Fix the building of cgi command lines when the query string
      contains '='.  PR 13914  [Ville Skyttä <ville.skytta@iki.fi>,
      Jeff Trawick]
@@ -40,6 +24,26 @@ Changes with Apache 2.0.44
      implementation which broke IPv4 listening sockets on some
      systems.  [hiroyuki hanai <hanai@imgsrc.co.jp>]
 
+
+  [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.44
+
+  *) Add version string to provider API.  [Justin Erenkrantz]
+
+  *) build: './configure && make' now works without an in-tree
+     apr and apr-util. [Wilfredo Sanchez]
+
+  *) mod_negotiation: Set the appropriate mime response headers
+     (Content-Type, charset, Content-Language and Content-Encoding)
+     for negotated type-map "Body:" responses (such as the error
+     pages.)  [André Malo <nd@perlig.de>]
+
+  *) mod_log_config: Allow '%%' escaping in CustomLog format
+     strings to insert a literal, single '%'.
+     [André Malo <nd@perlig.de>]
+
   *) mod_autoindex: AddDescription directives for directories
      now work as in Apache 1.3, where no trailing '/' is
      specified on the directory name.  Previously, the trailing