From: Daniel Earl Poirier <poirier@apache.org>
Date: Thu, 14 Jan 2010 15:52:52 +0000 (+0000)
Subject: Clarify references to arguments in the Header directive documentation.
X-Git-Tag: 2.2.15~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e2ff26a0d2b1695f924c81bcd8515a5d93e78e;p=thirdparty%2Fapache%2Fhttpd.git

Clarify references to arguments in the Header directive documentation.
(The first argument is optional, so referring to any argument by
absolute position is ambiguous).


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

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 78bbcb5448d..42eb811617b 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -222,8 +222,9 @@ headers</td></tr>
     successful responses, and is always needed to affect non-<code>2<var>xx</var></code> 
     responses such as redirects or client errors.</p>
 
-    <p>The action it performs is determined by the second
-    argument. This can be one of the following values:</p>
+    <p>The action it performs is determined by the first
+    argument (second argument if a <var>condition</var> is specified).
+    This can be one of the following values:</p>
 
     <dl>
     <dt><code>set</code></dt>
@@ -284,7 +285,7 @@ headers</td></tr>
     expression</a>.</p>
 
     <p>For <code>set</code>, <code>append</code>, <code>merge</code> and
-    <code>add</code> a <var>value</var> is specified as the third argument.
+    <code>add</code> a <var>value</var> is specified as the next argument.
     If <var>value</var>
     contains spaces, it should be surrounded by double quotes.
     <var>value</var> may be a character string, a string containing format
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 26c2c99a15d..bef45ae4ddd 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -306,8 +306,9 @@ headers</description>
     successful responses, and is always needed to affect non-<code>2<var>xx</var></code> 
     responses such as redirects or client errors.</p>
 
-    <p>The action it performs is determined by the second
-    argument. This can be one of the following values:</p>
+    <p>The action it performs is determined by the first
+    argument (second argument if a <var>condition</var> is specified).
+    This can be one of the following values:</p>
 
     <dl>
     <dt><code>set</code></dt>
@@ -368,7 +369,7 @@ headers</description>
     expression</glossary>.</p>
 
     <p>For <code>set</code>, <code>append</code>, <code>merge</code> and
-    <code>add</code> a <var>value</var> is specified as the third argument.
+    <code>add</code> a <var>value</var> is specified as the next argument.
     If <var>value</var>
     contains spaces, it should be surrounded by double quotes.
     <var>value</var> may be a character string, a string containing format