httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r654805 [2/2] - in /httpd/httpd/branches/2.2.x/docs/manual: ./ developer/ faq/ howto/ misc/ mod/ platform/ programs/ rewrite/ ssl/ vhosts/
Date Fri, 09 May 2008 13:35:32 GMT
Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.html.en?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.html.en Fri May  9 06:35:27 2008
@@ -165,13 +165,41 @@
           RequestHeader edit Destination ^https: http: early
         </code></p></div>
       </li>
+
+      <li>
+        Set the same header value under multiple non-exclusive conditions,
+        but do not duplicate the value in the final header.
+        If all of the following conditions applied to a request (i.e.,
+        if the <code>CGI</code>, <code>NO_CACHE</code> and
+        <code>NO_STORE</code> environment variables all existed for the
+        request):
+
+        <div class="example"><p><code>
+          Header merge Cache-Control no-cache env=CGI<br />
+          Header merge Cache-Control no-cache env=NO_CACHE<br />
+          Header merge Cache-Control no-store env=NO_STORE
+        </code></p></div>
+
+        <p>then the response would contain the following header:</p>
+
+        <div class="example"><p><code>
+          Cache-Control: no-cache, no-store
+        </code></p></div>
+
+        <p>If <code>append</code> was used instead of <code>merge</code>,
+        then the response would contain the following header:</p>
+
+        <div class="example"><p><code>
+          Cache-Control: no-cache, no-cache, no-store
+        </code></p></div>
+      </li>
     </ol>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP response headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
@@ -206,12 +234,22 @@
     header it is separated from the existing header with a comma.
     This is the HTTP standard way of giving a header multiple values.</dd>
 
+    <dt><code>merge</code></dt>
+    <dd>The response header is appended to any existing header of
+    the same name, unless the value to be appended already appears in the
+    header's comma-delimited list of values.  When a new value is merged onto
+    an existing header it is separated from the existing header 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>
+
     <dt><code>add</code></dt>
     <dd>The response header is added to the existing set of headers,
     even if this header already exists. This can result in two
     (or more) headers having the same name. This can lead to
-    unforeseen consequences, and in general <code>set</code> or
-    <code>append</code> should be used instead.</dd>
+    unforeseen consequences, and in general <code>set</code>,
+    <code>append</code> or <code>merge</code> should be used instead.</dd>
 
     <dt><code>unset</code></dt>
     <dd>The response header of this name is removed, if it exists.
@@ -236,14 +274,15 @@
 
     <p>This argument is followed by a <var>header</var> name, which
     can include the final colon, but it is not required. Case is
-    ignored for <code>set</code>, <code>append</code>, <code>add</code>,
-    <code>unset</code>, and <code>edit</code>.
+    ignored for <code>set</code>, <code>append</code>, <code>merge</code>,
+    <code>add</code>, <code>unset</code> and <code>edit</code>.
     The <var>header</var> name for <code>echo</code>
     is case sensitive and may be a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular
     expression</a>.</p>
 
-    <p>For <code>set</code>, <code>append</code> and <code>add</code> a
-    <var>value</var> is specified as the third argument. If <var>value</var>
+    <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.
+    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
     specifiers or a combination of both. The following format specifiers
@@ -303,7 +342,7 @@
 <div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP request headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|add|unset|edit <var>header</var>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
@@ -330,12 +369,22 @@
     is the HTTP standard way of giving a header multiple
     values.</dd>
 
+    <dt><code>merge</code></dt>
+    <dd>The response 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
+    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>
+
     <dt><code>add</code></dt>
     <dd>The request header is added to the existing set of headers,
     even if this header already exists. This can result in two
     (or more) headers having the same name. This can lead to
-    unforeseen consequences, and in general <code>set</code> or
-    <code>append</code> should be used instead.</dd>
+    unforeseen consequences, and in general <code>set</code>,
+    <code>append</code> or <code>merge</code> should be used instead.</dd>
 
     <dt><code>unset</code></dt>
     <dd>The request header of this name is removed, if it exists. If
@@ -354,7 +403,7 @@
 
     <p>This argument is followed by a header name, which can
     include the final colon, but it is not required. Case is
-    ignored. For <code>set</code>, <code>append</code> and
+    ignored. For <code>set</code>, <code>append</code>, <code>merge</code> and
     <code>add</code> a <var>value</var> is given as the third argument. If a
     <var>value</var> contains spaces, it should be surrounded by double
     quotes. For <code>unset</code>, no <var>value</var> should be given.

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ja?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ja [iso-2022-jp] Fri May  9 06:35:27 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:653847 (outdated) -->
+<!-- English Revision: 151408:654797 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ko?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.ko [euc-kr] Fri May  9 06:35:27 2008
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:653847 (outdated) -->
+<!-- English Revision: 151408:654797 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_headers.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_headers</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ident.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ident.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ident.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ident.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_ident</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_imagemap.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_imagemap</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_include.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_include</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_info.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_info.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_info.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_info.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_info</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_isapi.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_isapi</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ldap.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_ldap</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_config.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_config.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_config.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_config.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_log_config</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_forensic.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_forensic.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_forensic.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_log_forensic.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_log_forensic</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_logio.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_logio.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_logio.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_logio.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_logio</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_mem_cache</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_mime</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mime_magic.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_mime_magic</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_negotiation.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_negotiation</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_nw_ssl.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_nw_ssl.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_nw_ssl.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_nw_ssl.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_nw_ssl</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_proxy</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ajp.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_proxy_ajp</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_balancer.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_proxy_balancer</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_connect.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_connect.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_connect.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_connect.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_proxy_connect</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ftp.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ftp.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ftp.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_ftp.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_proxy_ftp</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_proxy_http.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_proxy_http</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_rewrite.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_rewrite</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_setenvif.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_setenvif</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_so.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_so.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_so.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_so.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_so</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_speling.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_speling.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_speling.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_speling.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_speling</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_ssl.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_ssl</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_status.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_status</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_substitute.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_substitute.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_substitute.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_substitute.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_substitute</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_suexec.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_suexec.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_suexec.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_suexec.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_suexec</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_unique_id.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_unique_id.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_unique_id.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_unique_id.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_unique_id</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_userdir.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_userdir</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_usertrack.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_usertrack</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_version.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_version.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_version.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_version.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_version</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_vhost_alias.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_vhost_alias.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_vhost_alias.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_vhost_alias.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mod_vhost_alias</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/module-dict.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/module-dict.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/module-dict.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/module-dict.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>module-dict</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_common.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mpm_common</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_netware.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_netware.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_netware.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_netware.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mpm_netware</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_winnt.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_winnt.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_winnt.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpm_winnt.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mpm_winnt</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mpmt_os2.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mpmt_os2.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mpmt_os2.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mpmt_os2.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mpmt_os2</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/prefork.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/prefork.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/prefork.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/prefork.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>prefork</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.de Fri May  9 06:35:27 2008
@@ -349,7 +349,7 @@
 <tr class="odd"><td><a href="mod_log_forensic.html#forensiclog">ForensicLog <var>filename</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Sets filename of the forensic log</td></tr>
 <tr><td><a href="mpm_common.html#group" id="G" name="G">Group <var>Unix-Gruppe</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Benutzergruppe, unter welcher der Server Anfragen
   beantwortet</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -579,7 +579,7 @@
 <tr><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
 ...</a></td><td></td><td>vdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
+<tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
 <tr><td><a href="core.html#require">Require <var>Name</var> [<var>Name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr><td class="descr" colspan="4">Wählt die authentisierten Benutzer aus, die auf eine
 Ressource zugreifen können</td></tr>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.en Fri May  9 06:35:27 2008
@@ -342,7 +342,7 @@
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -567,7 +567,7 @@
 <tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
 ...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
 <tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.es Fri May  9 06:35:27 2008
@@ -349,7 +349,7 @@
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -574,7 +574,7 @@
 <tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
 ...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
 <tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r [koi8-r] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.ru.koi8-r [koi8-r] Fri May  9 06:35:27 2008
@@ -347,7 +347,7 @@
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -572,7 +572,7 @@
 <tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
 ...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
 <tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.tr.utf8
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.tr.utf8?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.tr.utf8 [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.html.tr.utf8 [utf-8] Fri May  9 06:35:27 2008
@@ -335,7 +335,7 @@
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|merge|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>skdh</td><td>T</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -560,7 +560,7 @@
 <tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
 ...</a></td><td></td><td>kdh</td><td>T</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|merge|add|unset|edit <var>header</var>
 [<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
 <tr class="odd"><td><a href="core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>Ç</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/quickreference.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>quickreference</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/worker.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/worker.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/worker.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/worker.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>worker</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/mpm.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mpm.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mpm.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mpm.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mpm</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/new_features_2_0.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/new_features_2_0.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/new_features_2_0.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/new_features_2_0.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>new_features_2_0</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/new_features_2_2.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>new_features_2_2</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/ebcdic.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/ebcdic.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/ebcdic.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/ebcdic.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ebcdic</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/index.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/index.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/index.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>index</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/netware.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>netware</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/perf-hp.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/perf-hp.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/perf-hp.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/perf-hp.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>perf-hp</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/win_compiling.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>win_compiling</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/platform/windows.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>windows</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/ab.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/ab.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/ab.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/ab.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ab</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/apachectl.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/apachectl.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/apachectl.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/apachectl.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>apachectl</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/apxs.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/apxs.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/apxs.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/apxs.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>apxs</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/configure.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>configure</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/dbmmanage.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/dbmmanage.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/dbmmanage.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/dbmmanage.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>dbmmanage</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/htcacheclean.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/htcacheclean.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/htcacheclean.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/htcacheclean.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>htcacheclean</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/htdbm.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/htdbm.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/htdbm.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/htdbm.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>htdbm</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/htdigest.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/htdigest.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/htdigest.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/htdigest.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>htdigest</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/htpasswd.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>htpasswd</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/httpd.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>httpd</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/httxt2dbm.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>httxt2dbm</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/index.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/index.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/index.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>index</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/logresolve.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/logresolve.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/logresolve.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/logresolve.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>logresolve</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/other.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/other.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/other.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/other.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>other</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/rotatelogs.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/rotatelogs.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/rotatelogs.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/rotatelogs.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>rotatelogs</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/programs/suexec.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/programs/suexec.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/programs/suexec.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/programs/suexec.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>suexec</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/index.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/index.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/index.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>index</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_flags.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_flags.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_flags.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_flags.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>rewrite_flags</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>rewrite_guide</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_guide_advanced.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>rewrite_guide_advanced</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_intro.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>rewrite_intro</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_tech.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_tech.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_tech.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/rewrite/rewrite_tech.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>rewrite_tech</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/sections.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/sections.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/sections.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/sections.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>sections</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/server-wide.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/server-wide.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/server-wide.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/server-wide.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>server-wide</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/sitemap.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/sitemap.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/sitemap.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/sitemap.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>sitemap</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/ssl/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/ssl/index.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/ssl/index.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/ssl/index.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>index</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_compat.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_compat.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_compat.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_compat.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ssl_compat</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_faq.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_faq.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_faq.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_faq.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ssl_faq</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_howto.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_howto.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_howto.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_howto.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ssl_howto</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_intro.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_intro.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_intro.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/ssl/ssl_intro.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ssl_intro</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/stopping.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>stopping</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/suexec.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/suexec.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/suexec.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/suexec.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>suexec</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/upgrading.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/upgrading.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/upgrading.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/upgrading.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>upgrading</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/urlmapping.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>urlmapping</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/details.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/details.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/details.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/details.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>details</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/examples.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/examples.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/examples.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/examples.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>examples</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/fd-limits.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/fd-limits.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/fd-limits.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/fd-limits.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>fd-limits</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/index.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>index</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/ip-based.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>ip-based</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/mass.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>mass</basename>

Modified: httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml.meta?rev=654805&r1=654804&r2=654805&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml.meta (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/vhosts/name-based.xml.meta Fri May  9 06:35:27 2008
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- GENERATED FROM XML: DO NOT EDIT -->
 
 <metafile>
   <basename>name-based</basename>



Mime
View raw message