Note when "merge" was added to Header and RequestHeader

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

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 249a3c8811550eadf62bf38f245773b4bffa6877..9e4cb8cdc43f4e85d8e79555fadf909dfe6536d2 100644 (file)
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -205,8 +205,9 @@ headers</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The <code>edit</code> argument is available in version
-2.2.4 and later</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The <code>merge</code> argument is available in version
+2.2.9 and later. The <code>edit</code> argument is available in version
+2.2.4 and later.</td></tr>
 </table>
     <p>This directive can replace, merge or remove HTTP response
     headers. The header is modified just after the content handler
@@ -242,7 +243,8 @@ headers</td></tr>
     This is the HTTP standard way of giving a header multiple values.
     Values are compared in a case sensitive manner, and after
     all format specifiers have been processed.  Values in double quotes
-    are considered different from otherwise identical unquoted values.</dd>
+    are considered different from otherwise identical unquoted values.
+    <em>Available in version 2.2.9 and later.</em></dd>
 
     <dt><code>add</code></dt>
     <dd>The response header is added to the existing set of headers,
@@ -348,8 +350,9 @@ headers</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_headers</td></tr>
-<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The <code>edit</code> argument is available in version
-2.2.4 and later</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>The <code>merge</code> argument is available in version
+2.2.9 and later. The <code>edit</code> argument is available in version
+2.2.4 and later.</td></tr>
 </table>
     <p>This directive can replace, merge, change or remove HTTP request
     headers. The header is modified just before the content handler
@@ -377,7 +380,8 @@ headers</td></tr>
     with a comma.  This is the HTTP standard way of giving a header multiple
     values.  Values are compared in a case sensitive manner, and after
     all format specifiers have been processed.  Values in double quotes
-    are considered different from otherwise identical unquoted values.</dd>
+    are considered different from otherwise identical unquoted values.
+    <em>Available in version 2.2.9 and later.</em></dd>
 
     <dt><code>add</code></dt>
     <dd>The request header is added to the existing set of headers,

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index e4f973d8c3370377bae6b9338f0dc9b7aa74b92b..15cd796de2233be2d316c84f44ef45fcdaf61f11 100644 (file)
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -192,8 +192,9 @@ headers</description>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>The <code>edit</code> argument is available in version
-2.2.4 and later</compatibility>
+<compatibility>The <code>merge</code> argument is available in version
+2.2.9 and later. The <code>edit</code> argument is available in version
+2.2.4 and later.</compatibility>
 
 <usage>
     <p>This directive can replace, merge, change or remove HTTP request
@@ -222,7 +223,8 @@ headers</description>
     with a comma.  This is the HTTP standard way of giving a header multiple
     values.  Values are compared in a case sensitive manner, and after
     all format specifiers have been processed.  Values in double quotes
-    are considered different from otherwise identical unquoted values.</dd>
+    are considered different from otherwise identical unquoted values.
+    <em>Available in version 2.2.9 and later.</em></dd>
 
     <dt><code>add</code></dt>
     <dd>The request header is added to the existing set of headers,
@@ -287,8 +289,9 @@ headers</description>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>The <code>edit</code> argument is available in version
-2.2.4 and later</compatibility>
+<compatibility>The <code>merge</code> argument is available in version
+2.2.9 and later. The <code>edit</code> argument is available in version
+2.2.4 and later.</compatibility>
 <usage>
     <p>This directive can replace, merge or remove HTTP response
     headers. The header is modified just after the content handler
@@ -324,7 +327,8 @@ headers</description>
     This is the HTTP standard way of giving a header multiple values.
     Values are compared in a case sensitive manner, and after
     all format specifiers have been processed.  Values in double quotes
-    are considered different from otherwise identical unquoted values.</dd>
+    are considered different from otherwise identical unquoted values.
+    <em>Available in version 2.2.9 and later.</em></dd>
 
     <dt><code>add</code></dt>
     <dd>The response header is added to the existing set of headers,