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 2a7dec9b7e36bbea402d3bb7278f39bb7eba213d..82ce04bff9747b5c869f320441ceeebf48b3efe9 100644 (file)
--- 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