From: André Malo <nd@apache.org>
Date: Thu, 19 Aug 2004 22:56:18 +0000 (+0000)
Subject: keep in sync
X-Git-Tag: STRIKER_2_1_0_RC1~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f402351cecb4917189caedc8b3090ce1d37711d;p=thirdparty%2Fapache%2Fhttpd.git

keep in sync


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

diff --git a/docs/manual/upgrading.xml b/docs/manual/upgrading.xml
index f0ea6b7d531..1206eb0e820 100644
--- a/docs/manual/upgrading.xml
+++ b/docs/manual/upgrading.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.en.xsl"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
 
 <!--
  Copyright 2002-2004 The Apache Software Foundation
@@ -169,6 +169,16 @@
       files.  The old behavior can be restored using the <directive
       module="mod_mime">MultiviewsMatch</directive> directive.</li>
 
+      <li>(<em>since version 2.0.51</em>)
+      <p>The functionality of the <code>ErrorHeader</code> directive was
+      put together with the <directive module="mod_headers">Header</directive>
+      directive, since it was a misnomer. Use</p>
+
+      <example>
+        Header always set foo bar
+      </example>
+
+      <p>instead to get the desired bahviour.</p></li>
     </ul>
   </section>