From: André Malo <nd@apache.org>
Date: Mon, 12 Jan 2004 15:56:17 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~819
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5498ba744f93009c8425aace68e8b7f932afe9b1;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index 325d47d917..1282c13757 100644
--- a/CHANGES
+++ b/CHANGES
@@ -74,12 +74,6 @@ Changes with Apache 2.1.0-dev
   *) mod_auth_ldap: Fix some segfaults in the cache logic.  PR 18756.
      [Matthieu Estrade <apache moresecurity.org>]
 
-  *) mod_autoindex: Add 'XHTML' option in order to allow switching between
-     HTML 3.2 and XHTML 1.0 output. PR 23747.  [André Malo]
-
-  *) Add XHTML Document Type Definitions to httpd.h (minor MMN bump).
-     [André Malo]
-
   *) mod_setenvif: Fix the regex optimizer, which under circumstances
      treated the supplied regex as literal string. PR 24219.
      [André Malo]
@@ -255,6 +249,12 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_autoindex: Add 'XHTML' option in order to allow switching between
+     HTML 3.2 and XHTML 1.0 output. PR 23747.  [André Malo]
+
+  *) Add XHTML Document Type Definitions to httpd.h (minor MMN bump).
+     [André Malo]
+
   *) mod_ssl: Advertise SSL library version as determined at run-time rather
      than at compile-time.  PR 23956.  [Eric Seidel <seidel apple.com>]