summaryrefslogtreecommitdiff
path: root/docs/manual/mod/mod_headers.xml
diff options
context:
space:
mode:
authorTakashi Sato <takashi@apache.org>2012-01-14 07:47:09 +0000
committerTakashi Sato <takashi@apache.org>2012-01-14 07:47:09 +0000
commit2cf78d471a2f2ab31159704168df187675ad9349 (patch)
treefc9828ea4e8b03c86f0372e8cef3e5d81b297b94 /docs/manual/mod/mod_headers.xml
parentccb0205ff892b163ea4c2a72901f9e3a23b0de1f (diff)
downloadhttpd-2cf78d471a2f2ab31159704168df187675ad9349.tar.gz
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.4.x@1231453 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual/mod/mod_headers.xml')
-rw-r--r--docs/manual/mod/mod_headers.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 9c80f74921..f40bc05a2a 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -235,7 +235,7 @@ headers</description>
than once.</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
@@ -360,7 +360,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 according
+ <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 the <var>replacement</var>