From: André Malo <nd@apache.org>
Date: Tue, 27 May 2003 20:43:50 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~1614
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=41152893ebaed35afd72df8e8521c4767f042423;p=apache

sync


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

diff --git a/CHANGES b/CHANGES
index d271af4e1f..464b4a6b83 100644
--- a/CHANGES
+++ b/CHANGES
@@ -98,10 +98,6 @@ Changes with Apache 2.1.0-dev
   *) Allow mod_dav to do weak entity comparison functions.
      [Justin Erenkrantz]
 
-  *) mod_negotiation: Introduce "prefer-language" environment variable,
-     which allows to influence the negotiation process on request basis
-     to prefer a certain language.  [André Malo]
-
   *) Move RFC 1413 ident requests from core to new module mod_ident.
      [André Malo]
 
@@ -138,6 +134,10 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.46
 
+  *) mod_negotiation: Introduce "prefer-language" environment variable,
+     which allows to influence the negotiation process on request basis
+     to prefer a certain language.  [André Malo]
+
   *) Fix for mod_dav.  Call the 'can_be_activity' callback, if provided,
      when a MKACTIVITY request comes in.
      [Ben Collins-Sussman <sussman@collab.net>]