From: Takashi Sato <takashi@apache.org>
Date: Sat, 14 Jan 2012 07:48:11 +0000 (+0000)
Subject: Merge r1231446from trunk:
X-Git-Tag: 2.2.22~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c8279561136b110b719ac218a4e559ecda0e6cf;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1231446from trunk:

Fix the request/response header error

Submitted by: INOUE Seiichiro <inoue ariel-networks.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1231454 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 2a7dec9b7e3..82ce04bff97 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -216,7 +216,7 @@ headers</description>
     values.</dd>
 
     <dt><code>merge</code></dt>
-    <dd>The response header is appended to any existing header of
+    <dd>The request header is appended to any existing header of
     the same name, unless the value to be appended already appears in the
     existing header's comma-delimited list of values.  When a new value is
     merged onto an existing header it is separated from the existing header
@@ -370,7 +370,7 @@ headers</description>
     <var>value</var> must be omitted.</dd>
 
     <dt><code>edit</code></dt>
-    <dd>If this request header exists, its value is transformed
+    <dd>If this response header exists, its value is transformed
     according to a <glossary ref="regex">regular expression</glossary>
     search-and-replace.  The <var>value</var> argument is
     a <glossary ref="regex">regular expression</glossary>, and