From: Stefan Fritsch <sf@apache.org>
Date: Sat, 23 Jan 2010 16:24:17 +0000 (+0000)
Subject: Update transformations
X-Git-Tag: 2.3.6~560
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=252a0f2ccde2c0ac76428a5c78d23f08969272f5;p=apache

Update transformations


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@902436 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/index.html.fr b/docs/manual/index.html.fr
index 7cdbe3c654..70da893846 100644
--- a/docs/manual/index.html.fr
+++ b/docs/manual/index.html.fr
@@ -31,8 +31,6 @@
 <a href="./pt-br/" hreflang="pt-br" rel="alternate" title="Português (Brasil)">&nbsp;pt-br&nbsp;</a> |
 <a href="./tr/" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a></p>
 </div>
-<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
-            anglaise pour les changements récents.</div>
 <form method="get" action="http://www.google.com/search"><p><input name="as_q" value="" type="text" /> <input value="Recherche Google" type="submit" /><input value="10" name="num" type="hidden" /><input value="fr" name="hl" type="hidden" /><input value="ISO-8859-1" name="ie" type="hidden" /><input value="Google Search" name="btnG" type="hidden" /><input name="as_epq" value="Version 2.3" type="hidden" /><input name="as_oq" value="" type="hidden" /><input name="as_eq" value="&quot;List-Post&quot;" type="hidden" /><input value="" name="lr" type="hidden" /><input value="i" name="as_ft" type="hidden" /><input value="" name="as_filetype" type="hidden" /><input value="all" name="as_qdr" type="hidden" /><input value="any" name="as_occt" type="hidden" /><input value="i" name="as_dt" type="hidden" /><input value="httpd.apache.org" name="as_sitesearch" type="hidden" /><input value="off" name="safe" type="hidden" /></p></form>
 <table id="indextable"><tr><td class="col1"><div class="category"><h2><a name="release" id="release">Notes de version</a></h2>
 <ul><li><a href="new_features_2_4.html">Nouvelles fonctionnalités dApache 2.3/2.4</a></li>
@@ -69,7 +67,7 @@
 <li><a href="server-wide.html">Configuration à l'échelle du serveur</a></li>
 <li><a href="ssl/">Chiffrement SSL/TLS</a></li>
 <li><a href="suexec.html">Exécution des CGI avec suexec</a></li>
-<li><a href="rewrite/">Guide de réécriture des URLs</a></li>
+<li><a href="rewrite/">Réécriture des URLs avec mod_rewrite</a></li>
 <li><a href="vhosts/">Hôtes virtuels</a></li>
 </ul>
 </div></td><td class="col3"><div class="category"><h2><a name="howto" id="howto">Recettes / Tutoriels</a></h2>
diff --git a/docs/manual/index.xml.meta b/docs/manual/index.xml.meta
index c49227101c..2316cabbce 100644
--- a/docs/manual/index.xml.meta
+++ b/docs/manual/index.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">pt-br</variant>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index e9b300e4fe..bb47519926 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 167959:890378 (outdated) -->
+<!-- English Revision: 167959:896299 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 0ed19d4f4c..761c093779 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:890378 (outdated) -->
+<!-- English Revision: 669847:896299 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 940e233ba1..7ffd1b460c 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:890378 (outdated) -->
+<!-- English Revision: 813376:896299 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index 88b615c947..42ed7912ff 100644
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -369,7 +369,7 @@
 <li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
-<li><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout</a></li>
+<li><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout</a></li>
 <li><a href="core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index b214e5bf84..df8a817cd5 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -371,7 +371,7 @@
 <li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
-<li><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout</a></li>
+<li><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
 <li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
index ae6eba3d6d..b833fa27f8 100644
--- a/docs/manual/mod/directives.html.es
+++ b/docs/manual/mod/directives.html.es
@@ -373,7 +373,7 @@
 <li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
-<li><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout</a></li>
+<li><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
 <li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8
index 19030d062a..e1910393e7 100644
--- a/docs/manual/mod/directives.html.ja.utf8
+++ b/docs/manual/mod/directives.html.ja.utf8
@@ -361,7 +361,7 @@
 <li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
-<li><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout</a></li>
+<li><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
 <li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
index 3fb2bae785..0ec37f28a0 100644
--- a/docs/manual/mod/directives.html.ko.euc-kr
+++ b/docs/manual/mod/directives.html.ko.euc-kr
@@ -359,7 +359,7 @@
 <li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
-<li><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout</a></li>
+<li><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
 <li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8
index b5e192c1d4..13467f066c 100644
--- a/docs/manual/mod/directives.html.tr.utf8
+++ b/docs/manual/mod/directives.html.tr.utf8
@@ -368,7 +368,7 @@
 <li><a href="mod_mime.html#removeoutputfilter">RemoveOutputFilter</a></li>
 <li><a href="mod_mime.html#removetype">RemoveType</a></li>
 <li><a href="mod_headers.html#requestheader">RequestHeader</a></li>
-<li><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout</a></li>
+<li><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout</a></li>
 <li><a href="mod_authz_core.html#require">Require</a></li>
 <li><a href="mod_authz_core.html#requireall">&lt;RequireAll&gt;</a></li>
 <li><a href="mod_authz_core.html#requireany">&lt;RequireAny&gt;</a></li>
diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja
index b17a483cc6..677ca09691 100644
--- a/docs/manual/mod/mod_headers.xml.ja
+++ b/docs/manual/mod/mod_headers.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 151408:894036 (outdated) -->
+<!-- English Revision: 151408:899254 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_headers.xml.ko b/docs/manual/mod/mod_headers.xml.ko
index cd5735a9b5..dab8071566 100644
--- a/docs/manual/mod/mod_headers.xml.ko
+++ b/docs/manual/mod/mod_headers.xml.ko
@@ -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:894036 (outdated) -->
+<!-- English Revision: 151408:899254 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_reqtimeout.html.en b/docs/manual/mod/mod_reqtimeout.html.en
index 22f8f717b1..dec959a12d 100644
--- a/docs/manual/mod/mod_reqtimeout.html.en
+++ b/docs/manual/mod/mod_reqtimeout.html.en
@@ -32,7 +32,7 @@
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <ul id="toc">
-<li><img alt="" src="../images/down.gif" /> <a href="#requesttimeout">RequestTimeout</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#requestreadtimeout">RequestReadTimeout</a></li>
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
@@ -48,47 +48,45 @@
         30 seconds for receiving the request body:
 
         <div class="example"><p><code>
-          RequestTimeout headerinit=10 bodyinit=30
+          RequestReadTimeout header=10 body=30
         </code></p></div>
       </li>
 
       <li>
-        Allow at least 10 seconds to receive the request including the headers.
+        Allow at least 10 seconds to receive the request body.
         If the client sends data, increase the timeout by 1 second for every
-        500 bytes received. But do not allow more than 30 seconds for the
-        request including the headers:
+        1000 bytes received, with no upper limit for the timeout (exept for
+        the limit given indirectly by
+        <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>):
 
         <div class="example"><p><code>
-          RequestTimeout headerinit=10 headerminrate=500 headermax=30
+          RequestReadTimeout body=10,MinRate=1000
         </code></p></div>
       </li>
 
       <li>
-        Allow at least 10 seconds to receive the request body.
+        Allow at least 10 seconds to receive the request including the headers.
         If the client sends data, increase the timeout by 1 second for every
-        1000 bytes received, with no upper limit for the timeout (exept for
-        the limit given indirectly by
-        <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code>):
+        500 bytes received. But do not allow more than 30 seconds for the
+        request including the headers:
 
         <div class="example"><p><code>
-          RequestTimeout bodyinit=10 bodyminrate=1000
+          RequestReadTimeout header=10-30,MinRate=500
         </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="RequestTimeout" id="RequestTimeout">RequestTimeout</a> <a name="requesttimeout" id="requesttimeout">Directive</a></h2>
+<div class="directive-section"><h2><a name="RequestReadTimeout" id="RequestReadTimeout">RequestReadTimeout</a> <a name="requestreadtimeout" id="requestreadtimeout">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Set timeout values for receiving request headers and body from client.
 </td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; all values 0</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Unset; no limit</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_reqtimeout</td></tr>
@@ -106,46 +104,45 @@
     (usually the case on Linux and FreeBSD), the socket is not sent to the
     server process before at least one byte (or the whole request for
     <code>httpready</code>) is received. The header timeout configured with
-    <code>RequestTimeout</code> is only effective after the server process has
+    <code>RequestReadTimeout</code> is only effective after the server process has
     received the socket.</p>
 
-    <p>For the timeout parameters, the value 0 means no limit.</p>
+    <p>For each of the two timeout types (header or body), there are three ways
+    to specify the timeout:
+    </p>
+
+    <ul>
 
-    <dl>
+    <li><strong>Fixed timeout value</strong>:<br />
 
-    <dt><code>headerinit</code></dt>
-    <dd>The initial timeout for receiving the request headers in seconds. 
-    Also the timout for receiving the first byte of the request. If
-    <code>headerminrate</code> is not set, the request line and all headers
-    must be received within this time.</dd>
+    <div class="example"><p><code><var>type</var>=<var>timeout</var></code></p></div>
 
-    <dt><code>headerminrate</code></dt>
-    <dd>The minimum data rate for receiving the request headers in
-    bytes/second. Whenever data is received, the timeout is increased
-    according to this data rate.</dd>
+    <p>The time in seconds allowed for reading all of the request headers or
+    body, respectively. A value of 0 means no limit.</p>
+    </li>
 
-    <dt><code>headermax</code></dt>
-    <dd>The maximum timeout for receiving the request headers in seconds.
-    The timeout cannot be increased above this value by
-    <code>headerminrate</code>.</dd>
+    <li><strong>Timeout value that is increased when data is
+    received</strong>:<br />
+    <div class="example"><p><code>
+    <var>type</var>=<var>timeout</var>,MinRate=<var>data_rate</var>
+    </code></p></div>
 
-    <dt><code>bodyinit</code></dt>
-    <dd>The initial timeout for receiving the request body in seconds. 
-    Also the timout for receiving the first byte of the request body. If
-    <code>bodyminrate</code> is not set, the complete request body must be
-    received within this time.</dd>
+    <p>Same as above, but whenever data is received, the timeout value is
+    increased according to the specified minimum data rate (in bytes per
+    second).</p>
+    </li>
 
-    <dt><code>bodyminrate</code></dt>
-    <dd>The minimum data rate for receiving the request body in
-    bytes/second. Whenever data is received, the timeout is increased
-    according to this data rate.</dd>
+    <li><strong>Timeout value that is increased when data is received, with an
+    upper bound</strong>:<br />
+    <div class="example"><p><code>
+    <var>type</var>=<var>timeout</var>-<var>maxtimeout</var>,MinRate=<var>data_rate</var>
+    </code></p></div>
 
-    <dt><code>bodymax</code></dt>
-    <dd>The maximum timeout for receiving the request body in seconds.
-    The timeout cannot be increased above this value by
-    <code>bodyminrate</code></dd>
+    <p>Same as above, but the timeout will not be increased above the second
+    value of the specified timeout range.</p>
+    </li>
 
-    </dl>
+    </ul>
 
 
 </div>
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index d9a6ca4ccd..d012823f18 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -641,11 +641,9 @@ extensions</td></tr>
 extensions</td></tr>
 <tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader add|append|edit|edit*|merge|set|unset <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="mod_reqtimeout.html#requesttimeout">RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Set timeout values for receiving request headers and body from client.
 </td></tr>
 <tr class="odd"><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 class="odd"><td class="descr" colspan="4">Wählt die authentisierten Benutzer aus, die auf eine
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 156ef3ce34..2d3877130f 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -359,7 +359,7 @@ request</td></tr>
 <tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> options</td></tr>
 <tr><td><a href="mod_dir.html#fallbackresource" id="F" name="F">FallbackResource <var>local-url</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Define a default URL for requests that don't map to a file</td></tr>
 <tr class="odd"><td><a href="core.html#fileetag">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">File attributes used to create the ETag
-HTTP response header</td></tr>
+HTTP response header for static files</td></tr>
 <tr><td><a href="core.html#files">&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply to matched
 filenames</td></tr>
 <tr class="odd"><td><a href="core.html#filesmatch">&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply to regular-expression matched
@@ -629,11 +629,9 @@ extensions</td></tr>
 extensions</td></tr>
 <tr><td><a href="mod_headers.html#requestheader">RequestHeader add|append|edit|edit*|merge|set|unset <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="mod_reqtimeout.html#requesttimeout">RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr class="odd"><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Set timeout values for receiving request headers and body from client.
 </td></tr>
 <tr><td><a href="mod_authz_core.html#require">Require [not] <var>entity-name</var>
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index 075e311cb4..d08da8ad2b 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -366,7 +366,7 @@ request</td></tr>
 <tr class="odd"><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> options</td></tr>
 <tr><td><a href="mod_dir.html#fallbackresource" id="F" name="F">FallbackResource <var>local-url</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Define a default URL for requests that don't map to a file</td></tr>
 <tr class="odd"><td><a href="core.html#fileetag">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">File attributes used to create the ETag
-HTTP response header</td></tr>
+HTTP response header for static files</td></tr>
 <tr><td><a href="core.html#files">&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply to matched
 filenames</td></tr>
 <tr class="odd"><td><a href="core.html#filesmatch">&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply to regular-expression matched
@@ -636,11 +636,9 @@ extensions</td></tr>
 extensions</td></tr>
 <tr><td><a href="mod_headers.html#requestheader">RequestHeader add|append|edit|edit*|merge|set|unset <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="mod_reqtimeout.html#requesttimeout">RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr class="odd"><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Set timeout values for receiving request headers and body from client.
 </td></tr>
 <tr><td><a href="mod_authz_core.html#require">Require [not] <var>entity-name</var>
diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8
index 64b0cbc3eb..345e0e8f32 100644
--- a/docs/manual/mod/quickreference.html.ja.utf8
+++ b/docs/manual/mod/quickreference.html.ja.utf8
@@ -573,11 +573,9 @@ header</td></tr>
 解除する</td></tr>
 <tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
 [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">HTTP リクエストヘッダの設定</td></tr>
-<tr class="odd"><td><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr class="odd"><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </a></td><td></td><td>sv</td><td>X</td></tr><tr class="odd"><td class="descr" colspan="4">Set timeout values for receiving request headers and body from client.
 </td></tr>
 <tr><td><a href="mod_authz_core.html#require">Require [not] <var>entity-name</var>
diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr
index 288b8dca21..42f63cd4c2 100644
--- a/docs/manual/mod/quickreference.html.ko.euc-kr
+++ b/docs/manual/mod/quickreference.html.ko.euc-kr
@@ -326,7 +326,7 @@ in case of an error</td></tr>
 <tr class="odd"><td><a href="mod_ext_filter.html#extfilterdefine">ExtFilterDefine <var>filtername</var> <var>parameters</var></a></td><td></td><td>s</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">¿ÜºÎ ÇÊÅ͸¦ Á¤ÀÇÇÑ´Ù</td></tr>
 <tr><td><a href="mod_ext_filter.html#extfilteroptions">ExtFilterOptions <var>option</var> [<var>option</var>] ...</a></td><td> DebugLevel=0 NoLogS +</td><td>d</td><td>E</td></tr><tr><td class="descr" colspan="4"><code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code> ¿É¼ÇÀ» ¼³Á¤ÇÑ´Ù</td></tr>
 <tr class="odd"><td><a href="core.html#fileetag" id="F" name="F">FileETag <var>component</var> ...</a></td><td> INode MTime Size </td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">File attributes used to create the ETag
-HTTP response header</td></tr>
+HTTP response header for static files</td></tr>
 <tr><td><a href="core.html#files">&lt;Files <var>filename</var>&gt; ... &lt;/Files&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr><td class="descr" colspan="4">Contains directives that apply to matched
 filenames</td></tr>
 <tr class="odd"><td><a href="core.html#filesmatch">&lt;FilesMatch <var>regex</var>&gt; ... &lt;/FilesMatch&gt;</a></td><td></td><td>svdh</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Contains directives that apply to regular-expression matched
@@ -587,11 +587,9 @@ extensions</td></tr>
 extensions</td></tr>
 <tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <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">HTTP ¿äû Çì´õ¸¦ ±¸¼ºÇÑ´Ù</td></tr>
-<tr><td><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </a></td><td></td><td>sv</td><td>X</td></tr><tr><td class="descr" colspan="4">Set timeout values for receiving request headers and body from client.
 </td></tr>
 <tr class="odd"><td><a href="mod_authz_core.html#require">Require [not] <var>entity-name</var>
diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8
index b30d30f40a..f846bf9dfa 100644
--- a/docs/manual/mod/quickreference.html.tr.utf8
+++ b/docs/manual/mod/quickreference.html.tr.utf8
@@ -633,11 +633,9 @@ extensions</td></tr>
 extensions</td></tr>
 <tr class="odd"><td><a href="mod_headers.html#requestheader">RequestHeader add|append|edit|edit*|merge|set|unset <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 class="odd"><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
-<tr><td><a href="mod_reqtimeout.html#requesttimeout">RequestTimeout
-[headerinit=<var>time</var>
-[headerminrate=<var>rate</var> [headermax=<var>time</var>]]]
-[bodyinit=<var>time</var>
-[bodyminrate=<var>rate</var> [bodymax=<var>time</var>]]]
+<tr><td><a href="mod_reqtimeout.html#requestreadtimeout">RequestReadTimeout
+[header=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
+[body=<var>timeout</var>[[-<var>maxtimeout</var>],MinRate=<var>rate</var>]
 </a></td><td></td><td>sk</td><td>D</td></tr><tr><td class="descr" colspan="4">Set timeout values for receiving request headers and body from client.
 </td></tr>
 <tr class="odd"><td><a href="mod_authz_core.html#require">Require [not] <var>entity-name</var>