Update doccos and xforms

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

14 files changed, 134 insertions, 39 deletions

diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr
index c09aeecaa9..c365b7ef92 100644
--- a/docs/manual/expr.html.fr
+++ b/docs/manual/expr.html.fr
@@ -29,6 +29,12 @@
     <em>ap_expr</em>, pour toutes les directives de configuration. Ce
     document décrit l'interpréteur d'expressions <em>ap_expr</em>.
     </p>
+    <p>Le type d'expression <em>ap_expr</em> est appelé à remplacer la
+    plupart des autres types d'expressions dans HTTPD. Par exemple, la
+    directive obsolète <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code> peut être remplacée par la
+    directive <a href="mod/mod_authz_core.html#reqexpr">Require
+    expr</a>.
+    </p>
   </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#grammar">Syntaxe en Forme de Backus-Naur</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#vars">Variables</a></li>
@@ -36,7 +42,7 @@
 <li><img alt="" src="./images/down.gif" /> <a href="#unnop">Opérateurs unaires</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#functions">Fonctions</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#other">Autres</a></li>
-</ul><h3>Voir aussi</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if">If</a></code></li><li><code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li><li><code class="module"><a href="./mod/mod_setenvif.html">mod_setenvif</a></code></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li></ul></div>
+</ul><h3>Voir aussi</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if">If</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="grammar" id="grammar">Syntaxe en Forme de Backus-Naur</a></h2>
@@ -147,7 +153,11 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 <tr><td><code>REQUEST_URI</code></td>
         <td>L'URI de la requête</td></tr>
 <tr class="odd"><td><code>REQUEST_FILENAME</code></td>
-        <td /></tr>
+        <td>Le chemin complet dans le système de fichiers local du
+	fichier ou du script correspondant à la requête, si le serveur
+	l'a dèjà déterminé à l'instant où <code>REQUEST_FILENAME</code>
+	est référencée. Dans le cas contraire, comme dans un
+	contexte de serveur virtuel, même valeur que <code>REQUEST_URI</code> </td></tr>
 <tr><td><code>SCRIPT_FILENAME</code></td>
         <td>Identique à <code>REQUEST_FILENAME</code></td></tr>
 <tr class="odd"><td><code>SCRIPT_USER</code></td>
@@ -155,7 +165,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 <tr><td><code>SCRIPT_GROUP</code></td>
         <td>Le nom du groupe auquel appartient le script.</td></tr>
 <tr class="odd"><td><code>PATH_INFO</code></td>
-        <td /></tr>
+        <td>L'information relative au nom de chemin située en fin, voir
+	la directive <code class="directive"><a href="./mod/core.html#acceptpathinfo">AcceptPathInfo</a></code></td></tr>
 <tr><td><code>QUERY_STRING</code></td>
         <td>La chaîne de paramètres de la requête courante</td></tr>
 <tr class="odd"><td><code>IS_SUBREQ</code></td>
diff --git a/docs/manual/mod/mod_authn_socache.html.en b/docs/manual/mod/mod_authn_socache.html.en
index 4ae98e5dd0..f61fc40910 100644
--- a/docs/manual/mod/mod_authn_socache.html.en
+++ b/docs/manual/mod/mod_authn_socache.html.en
@@ -164,12 +164,11 @@ the load on backends</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_authn_socache</td></tr>
 </table>
-    <p>This is a server-wide setting.  If not set, your platform's
+    <p>This is a server-wide setting to select a provider for the
+    <a href="../socache.html">shared object cache</a>.
+    Values are "dbm", "dc", "mc", or "shmcb", each subject to the
+    appropriate module being loaded.  If not set, your platform's
        default will be used.</p>
-    <div class="note"><h3>socache</h3>
-      <p>The cache is built on the the <var>socache</var> framework.
-      We need a link here once that's documented!</p>
-    </div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
index a328dfb2be..54c43175cb 100644
--- a/docs/manual/mod/mod_rewrite.html.fr
+++ b/docs/manual/mod/mod_rewrite.html.fr
@@ -331,7 +331,9 @@ la réécriture soit effectuée
                   <dd>La ligne de requête HTTP complète envoyée par le
 		  navigateur au serveur (par exemple, "<code>GET
                   /index.html HTTP/1.1</code>"), à l'exclusion de tout
-		  en-tête ajouté par le navigateur.</dd>
+		  en-tête ajouté par le navigateur. Cette
+		  valeur n'a pas été déséchappée (décodée), à la
+		  différence de la plupart des variables suivantes.</dd>
 
                   <dt><code>REQUEST_URI</code></dt>
 
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 6ace83fd8e..c5a9d6e601 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -1722,7 +1722,7 @@ the left-hand-side expression.</p></li>
 
 <div class="note"><h3>SSLRequire is deprecated</h3>
 <p><code>SSLRequire</code> is deprecated and should in general be replaced
-by <a href="mod/mod_authz_core.html#reqexpr">Require expr</a>. The so called
+by <a href="mod_authz_core.html#reqexpr">Require expr</a>. The so called
 <a href="../expr.html">ap_expr</a> syntax of <code>Require expr</code> is
 a superset of the syntax of <code>SSLRequire</code>, with the following
 exception:</p>
@@ -1747,7 +1747,7 @@ For the latter, there are also aliases without the leading dashes:
 <li><a href="../env.html">Environment Variables in Apache HTTP Server</a>,
 for additional examples.
 </li>
-<li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li>
+<li><a href="mod_authz_core.html#reqexpr">Require expr</a></li>
 <li><a href="../expr.html">Generic expression syntax in Apache HTTP Server</a>
 </li>
 </ul>
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index c8ce14b8c6..d8a98d9af9 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -28,6 +28,7 @@
      document.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#core">Core Enhancements</a></li>
+<li><img alt="" src="./images/down.gif" /> <a href="#newmods">New Modules</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#module">Module Enhancements</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#programs">Program Enhancements</a></li>
 <li><img alt="" src="./images/down.gif" /> <a href="#developer">Module Developer Changes</a></li>
@@ -54,6 +55,49 @@
     </dl>
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
+<h2><a name="newmods" id="newmods">New Modules</a></h2>
+    
+    <dl>
+      <dt><code class="module"><a href="./mod/mod_allowmethods.html">mod_allowmethods</a></code></dt>
+      <dd>New module to restrict certain HTTP methods without interfering with
+      authentication or authorization.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_buffer.html">mod_buffer</a></code></dt>
+      <dd>Provides for buffering the input and output filter stacks</dd>
+
+      <dt><code class="module"><a href="./mod/mod_lua.html">mod_lua</a></code></dt>
+      <dd>Embeds the <a href="http://www.lua.org/">Lua</a> language into httpd, 
+      for configuration and small business logic functions.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_proxy_fcgi.html">mod_proxy_fcgi</a></code></dt>
+      <dd>FastCGI Protocol backend for <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></dd>
+
+      <dt><code class="module"><a href="./mod/mod_proxy_scgi.html">mod_proxy_scgi</a></code></dt>
+      <dd>SCGI Protocol backend for <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></dd>
+
+      <dt><code class="module"><a href="./mod/mod_ratelimit.html">mod_ratelimit</a></code></dt>
+      <dd>Provides Bandwidth Rate Limiting for Clients</dd>
+
+      <dt><code class="module"><a href="./mod/mod_reflector.html">mod_reflector</a></code></dt>
+      <dd>Provides Reflection of a request body as a response via the output filter stack.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_remoteip.html">mod_remoteip</a></code></dt>
+      <dd>Replaces the apparent client remote IP address and hostname for the request
+      with the IP address list presented by a proxies or a load balancer via
+      the request headers.</dd>
+
+      <dt><code class="module"><a href="./mod/mod_reqtimeout.html">mod_reqtimeout</a></code></dt>
+      <dd>Set timeout and minimum data rate for receiving requests</dd>
+
+      <dt><code class="module"><a href="./mod/mod_request.html">mod_request</a></code></dt>
+      <dd>Provides Filters to handle and make available HTTP request bodies</dd>
+
+      <dt><code class="module"><a href="./mod/mod_slotmem_shm.html">mod_slotmem_shm</a></code></dt>
+      <dd>Provides a Slot-based shared memory provider (ala the scoreboard).</dd>
+
+    </dl>
+  </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
+<div class="section">
 <h2><a name="module" id="module">Module Enhancements</a></h2>
     
     <dl>
@@ -72,11 +116,6 @@
       <dd><code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code> can now be configured to share SSL Session 
       data between servers through memcached</dd>
  
-      <dt><code class="module"><a href="./mod/mod_lua.html">mod_lua</a></code></dt>
-
-      <dd>Embeds the <a href="http://www.lua.org/">Lua</a> language into httpd, 
-      for configuration and small business logic functions.</dd>
-
       <dt><code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></dt>
 
       <dd>The <code class="directive"><a href="./mod/mod_proxy.html#proxypass">ProxyPass</a></code> directive
@@ -86,9 +125,13 @@
       block, and offers a significant performance advantage over the traditional
       two-parameter syntax when present in large numbers.</dd>
 
-      <dt><code class="module"><a href="./mod/mod_proxy_fcgi.html">mod_proxy_fcgi</a></code></dt>
+      <dt><code class="module"><a href="./mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code></dt>
 
-      <dd>FastCGI Protocol backend for <code class="module"><a href="./mod/mod_proxy.html">mod_proxy</a></code></dd>
+      <dd>More runtime configuration changes for BalancerMembers via balancer-manager</dd>
+
+      <dd>Additional BalancerMembers can be added at runtime via balancer-manager</dd>
+
+      <dd>Runtime configuration of a subset of Balancer parameters</dd>
 
       <dt><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code></dt>
 
@@ -106,10 +149,6 @@
       <dd><code class="module"><a href="./mod/mod_cache.html">mod_cache</a></code> can now insert HIT/MISS/REVALIDATE into
       an X-Cache header.</dd>
 
-      <dt><code class="module"><a href="./mod/mod_allowmethods.html">mod_allowmethods</a></code></dt>
-      <dd>New module to restrict certain HTTP methods without interfering with
-      authentication or authorization.</dd>
-
       <dt><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></dt>
       <dd>Support for the 'onerror' attribute within an 'include' element,
       allowing an error document to be served on error instead of the default
diff --git a/docs/manual/new_features_2_4.xml b/docs/manual/new_features_2_4.xml
index 70f7a8d7e4..8ee18599db 100644
--- a/docs/manual/new_features_2_4.xml
+++ b/docs/manual/new_features_2_4.xml
@@ -52,6 +52,49 @@
     </dl>
   </section>
 
+  <section id="newmods">
+    <title>New Modules</title>
+    <dl>
+      <dt><module>mod_allowmethods</module></dt>
+      <dd>New module to restrict certain HTTP methods without interfering with
+      authentication or authorization.</dd>
+
+      <dt><module>mod_buffer</module></dt>
+      <dd>Provides for buffering the input and output filter stacks</dd>
+
+      <dt><module>mod_lua</module></dt>
+      <dd>Embeds the <a href="http://www.lua.org/">Lua</a> language into httpd, 
+      for configuration and small business logic functions.</dd>
+
+      <dt><module>mod_proxy_fcgi</module></dt>
+      <dd>FastCGI Protocol backend for <module>mod_proxy</module></dd>
+
+      <dt><module>mod_proxy_scgi</module></dt>
+      <dd>SCGI Protocol backend for <module>mod_proxy</module></dd>
+
+      <dt><module>mod_ratelimit</module></dt>
+      <dd>Provides Bandwidth Rate Limiting for Clients</dd>
+
+      <dt><module>mod_reflector</module></dt>
+      <dd>Provides Reflection of a request body as a response via the output filter stack.</dd>
+
+      <dt><module>mod_remoteip</module></dt>
+      <dd>Replaces the apparent client remote IP address and hostname for the request
+      with the IP address list presented by a proxies or a load balancer via
+      the request headers.</dd>
+
+      <dt><module>mod_reqtimeout</module></dt>
+      <dd>Set timeout and minimum data rate for receiving requests</dd>
+
+      <dt><module>mod_request</module></dt>
+      <dd>Provides Filters to handle and make available HTTP request bodies</dd>
+
+      <dt><module>mod_slotmem_shm</module></dt>
+      <dd>Provides a Slot-based shared memory provider (ala the scoreboard).</dd>
+
+    </dl>
+  </section>
+
   <section id="module">
     <title>Module Enhancements</title>
     <dl>
@@ -70,11 +113,6 @@
       <dd><module>mod_ssl</module> can now be configured to share SSL Session 
       data between servers through memcached</dd>
  
-      <dt><module>mod_lua</module></dt>
-
-      <dd>Embeds the <a href="http://www.lua.org/">Lua</a> language into httpd, 
-      for configuration and small business logic functions.</dd>
-
       <dt><module>mod_proxy</module></dt>
 
       <dd>The <directive module="mod_proxy">ProxyPass</directive> directive
@@ -84,9 +122,13 @@
       block, and offers a significant performance advantage over the traditional
       two-parameter syntax when present in large numbers.</dd>
 
-      <dt><module>mod_proxy_fcgi</module></dt>
+      <dt><module>mod_proxy_balancer</module></dt>
 
-      <dd>FastCGI Protocol backend for <module>mod_proxy</module></dd>
+      <dd>More runtime configuration changes for BalancerMembers via balancer-manager</dd>
+
+      <dd>Additional BalancerMembers can be added at runtime via balancer-manager</dd>
+
+      <dd>Runtime configuration of a subset of Balancer parameters</dd>
 
       <dt><module>mod_cache</module></dt>
 
@@ -104,10 +146,6 @@
       <dd><module>mod_cache</module> can now insert HIT/MISS/REVALIDATE into
       an X-Cache header.</dd>
 
-      <dt><module>mod_allowmethods</module></dt>
-      <dd>New module to restrict certain HTTP methods without interfering with
-      authentication or authorization.</dd>
-
       <dt><module>mod_include</module></dt>
       <dd>Support for the 'onerror' attribute within an 'include' element,
       allowing an error document to be served on error instead of the default
@@ -197,4 +235,5 @@
     <p>The developer documentation contains a
     <a href="developer/new_api_2_4.html">detailed list of API changes</a>.</p>
   </section>
+
 </manualpage>
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
index e6252e7eec..804a596eda 100644
--- a/docs/manual/sitemap.html.de
+++ b/docs/manual/sitemap.html.de
@@ -29,6 +29,9 @@
 <a href="./tr/sitemap.html" hreflang="tr" rel="alternate" title="Türkçe">&nbsp;tr&nbsp;</a> |
 <a href="./zh-cn/sitemap.html" hreflang="zh-cn" rel="alternate" title="Simplified Chinese">&nbsp;zh-cn&nbsp;</a></p>
 </div>
+<div class="outofdate">Diese Übersetzung ist möglicherweise
+            nicht mehr aktuell. Bitte prüfen Sie die englische Version auf
+            die neuesten Änderungen.</div>
 
 <p>Diese Seite verzeichnet die zur Zeit verfügbaren Dokumente der
 <a href="./">Dokumentation zum Apache HTTP Server Version
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index 07f8c8d9b4..974c537cdc 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -75,8 +75,10 @@ Documentation</a>.</p>
 <li><a href="bind.html">Setting which addresses and ports Apache uses</a></li>
 <li><a href="mpm.html">Multi-Processing Modules (MPMs)</a></li>
 <li><a href="env.html">Environment Variables in Apache</a></li>
+<li><a href="expr.html">Expression Parsing in Apache</a></li>
 <li><a href="handler.html">Apache's Handler Use</a></li>
 <li><a href="filter.html">Filters</a></li>
+<li><a href="socache.html">Shared Object Cache Support</a></li>
 <li><a href="suexec.html">suEXEC Support</a></li>
 <li><a href="misc/perf-tuning.html">Performance Hints</a></li>
 <li><a href="http://wiki.apache.org/httpd/FAQ">Frequently Asked Questions</a></li>
diff --git a/docs/manual/sitemap.xml.de b/docs/manual/sitemap.xml.de
index d76279642d..a94aa16bc6 100644
--- a/docs/manual/sitemap.xml.de
+++ b/docs/manual/sitemap.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.de.xsl"?>
-<!-- English Revision: 1044380 -->
+<!-- English Revision: 1044380:1075625 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.es b/docs/manual/sitemap.xml.es
index 836721e0c5..2d886d60f4 100644
--- a/docs/manual/sitemap.xml.es
+++ b/docs/manual/sitemap.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.es.xsl"?>
-<!-- English Revision: 151408:1044380 (outdated) -->
+<!-- English Revision: 151408:1075625 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.ja b/docs/manual/sitemap.xml.ja
index 5e0c3025f7..40efbfdd5e 100644
--- a/docs/manual/sitemap.xml.ja
+++ b/docs/manual/sitemap.xml.ja
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?>
-<!-- English Revision: 587444:1044380 (outdated) -->
+<!-- English Revision: 587444:1075625 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.ko b/docs/manual/sitemap.xml.ko
index 010b90d51d..d35fae3feb 100644
--- a/docs/manual/sitemap.xml.ko
+++ b/docs/manual/sitemap.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?>
-<!-- English Revision: 151408:1044380 (outdated) -->
+<!-- English Revision: 151408:1075625 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/sitemap.xml.meta b/docs/manual/sitemap.xml.meta
index 9d830249a7..ed67e09c7b 100644
--- a/docs/manual/sitemap.xml.meta
+++ b/docs/manual/sitemap.xml.meta
@@ -7,7 +7,7 @@
   <relpath>.</relpath>
 
   <variants>
-    <variant>de</variant>
+    <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
     <variant>fr</variant>
diff --git a/docs/manual/sitemap.xml.tr b/docs/manual/sitemap.xml.tr
index c428ace864..26f7b56db3 100644
--- a/docs/manual/sitemap.xml.tr
+++ b/docs/manual/sitemap.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE sitemap SYSTEM "./style/sitemap.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?>
-<!-- English Revision: 832071:1044380 (outdated) -->
+<!-- English Revision: 832071:1075625 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>