Update transformations

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

13 files changed, 54 insertions, 84 deletions

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index d8fd3af885..833fb3f1f8 100644
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -157,11 +157,13 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td /></tr>
 <tr><td><code>CONTENT_TYPE</code></td>
         <td /></tr>
-<tr class="odd"><td><code>REMOTE_ADDR</code></td>
+<tr class="odd"><td><code>HANDLER</code></td>
         <td /></tr>
-<tr><td><code>HTTPS</code></td>
+<tr><td><code>REMOTE_ADDR</code></td>
         <td /></tr>
-<tr class="odd"><td><code>IPV6</code></td>
+<tr class="odd"><td><code>HTTPS</code></td>
+        <td /></tr>
+<tr><td><code>IPV6</code></td>
         <td /></tr>
 </table>
 
@@ -250,9 +252,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
     <table class="bordered"><tr class="header"><th>Name</th><th>Description</th></tr>
 <tr><td><code>-n</code></td>
-        <td>String is not empty (XXX: not yet implemented)</td></tr>
+        <td>String is not empty</td></tr>
 <tr class="odd"><td><code>-z</code></td>
-        <td>String is empty (XXX: not yet implemented)</td></tr>
+        <td>String is empty</td></tr>
 </table>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
@@ -269,11 +271,16 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>Get HTTP request header</td></tr>
 <tr class="odd"><td><code>resp</code></td>
         <td>Get HTTP response header</td></tr>
-<tr><td><code>osenv</code></td>
+<tr><td><code>reqenv</code></td>
+        <td>Lookup request environment variable</td></tr>
+<tr class="odd"><td><code>osenv</code></td>
         <td>Lookup operating system environment variable</td></tr>
+<tr><td><code>note</code></td>
+        <td>Lookup request environment variable</td></tr>
 <tr class="odd"><td><code>env</code></td>
-        <td>Lookup request environment variable (XXX: will need to be changed for better ssl_expr compat)</td></tr>
-<tr><td><code>lolower</code></td>
+        <td>Reqturn first match of <code>note</code>, <code>reqenv</code>,
+            <code>osenv</code></td></tr>
+<tr><td><code>tolower</code></td>
         <td>Convert string to lower case</td></tr>
 <tr class="odd"><td><code>toupper</code></td>
         <td>Convert string to uppser case</td></tr>
@@ -281,6 +288,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>Escape special characters in %hex encoding</td></tr>
 <tr class="odd"><td><code>unescape</code></td>
         <td>Unescape %hex encoded string, leaving URL-special characters encoded (XXX: describe better)</td></tr>
+<tr><td><code>file</code></td>
+        <td>Read contents from a file</td></tr>
 </table>
 
     <p>In addition to string-valued functions, there are also list-valued functions which
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index a0242e044f..d9fbfec21a 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -165,7 +165,7 @@ request processing</dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
 <dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
-<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>Multi-protocol proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for load balancing </dd>
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index 552861dffb..929b0c42d0 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -167,7 +167,7 @@ request processing</dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
 <dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
-<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>Multi-protocol proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for load balancing </dd>
diff --git a/docs/manual/mod/index.html.fr b/docs/manual/mod/index.html.fr
index 1e4c2a73d7..ce4c47c663 100644
--- a/docs/manual/mod/index.html.fr
+++ b/docs/manual/mod/index.html.fr
@@ -100,8 +100,7 @@ fichiers</dd>
 manière similaire à la commande Unix <code>ls</code>, ou à la commande
 shell Win32 <code>dir</code></dd>
 <dt><a href="mod_buffer.html" id="B" name="B">mod_buffer</a></dt><dd>Support de la mise en tampon des requêtes</dd>
-<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Mise en cache de contenu référencé par un
-URI.</dd>
+<dt><a href="mod_cache.html" id="C" name="C">mod_cache</a></dt><dd>Filtre de mise en cache HTTP conforme à la RFC 2616</dd>
 <dt><a href="mod_cern_meta.html">mod_cern_meta</a></dt><dd>CERN httpd metafile semantics</dd>
 <dt><a href="mod_cgi.html">mod_cgi</a></dt><dd>Execution of CGI scripts</dd>
 <dt><a href="mod_cgid.html">mod_cgid</a></dt><dd>Execution of CGI scripts using an
@@ -118,8 +117,8 @@ client</dd>
 <dt><a href="mod_dir.html">mod_dir</a></dt><dd>Permet la redirection des adresses se terminant par un
 répertoire sans slash de fin et la mise à disposition des fichiers index
 de répertoire</dd>
-<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Gestionnaire de stockage du cache de contenu à base
-d'URIs</dd>
+<dt><a href="mod_disk_cache.html">mod_disk_cache</a></dt><dd>Module de stockage sur disque pour le filtre de mise en
+cache HTTP.</dd>
 <dt><a href="mod_dumpio.html">mod_dumpio</a></dt><dd>Dumps all I/O to error log as desired.</dd>
 <dt><a href="mod_echo.html" id="E" name="E">mod_echo</a></dt><dd>Un simple serveur d'écho pour illustrer les modules de
 protocole</dd>
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index e914caae7e..4cc277c65a 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -150,7 +150,7 @@ request processing</dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
 <dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
-<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>Multi-protocol proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for load balancing </dd>
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
index adc5b62e47..9b3989e2e8 100644
--- a/docs/manual/mod/index.html.tr.utf8
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -158,7 +158,7 @@ request processing</dd>
 <dt><a href="mod_nw_ssl.html">mod_nw_ssl</a></dt><dd>Enable SSL encryption for NetWare</dd>
 <dt><a href="mod_privileges.html" id="P" name="P">mod_privileges</a></dt><dd>Support for Solaris privileges and for running virtual hosts
 under different user IDs.</dd>
-<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>HTTP/1.1 proxy/gateway server</dd>
+<dt><a href="mod_proxy.html">mod_proxy</a></dt><dd>Multi-protocol proxy/gateway server</dd>
 <dt><a href="mod_proxy_ajp.html">mod_proxy_ajp</a></dt><dd>AJP support module for
 <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
 <dt><a href="mod_proxy_balancer.html">mod_proxy_balancer</a></dt><dd><code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code> extension for load balancing </dd>
diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en
index 0a827302bc..ff7227773e 100644
--- a/docs/manual/mod/mod_filter.html.en
+++ b/docs/manual/mod/mod_filter.html.en
@@ -134,7 +134,8 @@
     headers, environment variables, or the Handler used by this request.
     Unlike earlier versions, mod_filter now supports complex expressions
     involving multiple criteria with AND / OR logic (&amp;&amp; / ||)
-    and brackets.</dd>
+    and brackets. The details of the expression syntax are described in
+    the <a href="../expr.html">ap_expr documentation</a>.</dd>
 
     <dt>Configure the Chain</dt>
     <dd>The above directives build components of a smart filter chain,
@@ -160,15 +161,14 @@
     more versatile <var>expression</var>.  In general, you can convert
     a match/dispatch pair to the two sides of an expression, using
     something like:</p>
-    <div class="example"><p><code>"dispatch = match"</code></p></div>
+    <div class="example"><p><code>"dispatch = 'match'"</code></p></div>
     <p>The Request headers, Response headers and Environment variables
-    are now interpreted from syntax <var>$req{foo}</var>,
-    <var>$resp{foo}</var> and <var>$env{foo}</var> respectively.
-    The variables <var>$handler</var> and <var>$Content-Type</var>
+    are now interpreted from syntax <var>%{req:foo}</var>,
+    <var>%{resp:foo}</var> and <var>%{env:foo}</var> respectively.
+    The variables <var>%{HANDLER}</var> and <var>%{CONTENT_TYPE}</var>
     are also supported.</p>
-    <p>Note that the match no longer supports integer comparisons
-    or substring matches.  The latter can be replaced by regular
-    expression matches.</p>
+    <p>Note that the match no longer support substring matches.  They can be
+    replaced by regular expression matches.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="examples" id="examples">Examples</a></h2>
@@ -177,7 +177,7 @@
     <dd>A simple case of replacing <code class="directive">AddOutputFilterByType</code>
     <div class="example"><p><code>
       FilterDeclare SSI<br />
-      FilterProvider SSI INCLUDES "$resp{Content-Type} = /^text\/html/"<br />
+      FilterProvider SSI INCLUDES "%{CONTENT_TYPE} =~ m|^text/html|"<br />
       FilterChain SSI
     </code></p></div>
     </dd>
@@ -186,7 +186,7 @@
     <dd>The same as the above but dispatching on handler (classic
     SSI behaviour; .shtml files get processed).
     <div class="example"><p><code>
-      FilterProvider SSI INCLUDES "Handler = server-parsed"<br />
+      FilterProvider SSI INCLUDES "%{HANDLER} = 'server-parsed'"<br />
       FilterChain SSI
     </code></p></div>
     </dd>
@@ -196,7 +196,7 @@
     Accept-Encoding header.  This filter runs with ftype CONTENT_SET.
     <div class="example"><p><code>
       FilterDeclare gzip CONTENT_SET<br />
-      FilterProvider gzip inflate "$req{Accept-Encoding} != /gzip/"<br />
+      FilterProvider gzip inflate "%{req:Accept-Encoding} !~ /gzip/"<br />
       FilterChain gzip
     </code></p></div>
     </dd>
@@ -205,16 +205,16 @@
     <dd>Suppose we want to downsample all web images, and have filters
     for GIF, JPEG and PNG.
     <div class="example"><p><code>
-      FilterProvider unpack jpeg_unpack "$resp{Content-Type} = image/jpeg"<br />
-      FilterProvider unpack gif_unpack "$resp{Content-Type} = image/gif"<br />
-      FilterProvider unpack png_unpack "$resp{Content-Type} = image/png"<br />
+      FilterProvider unpack jpeg_unpack "%{CONTENT_TYPE} = 'image/jpeg'"<br />
+      FilterProvider unpack gif_unpack "%{CONTENT_TYPE} = 'image/gif'"<br />
+      FilterProvider unpack png_unpack "%{CONTENT_TYPE} = 'image/png'"<br />
       <br />
-      FilterProvider downsample downsample_filter "$resp{Content-Type} = /image\/(jpeg|gif|png)/"<br />
+      FilterProvider downsample downsample_filter "%{CONTENT_TYPE} = m|^image/(jpeg|gif|png)|"<br />
       FilterProtocol downsample "change=yes"<br />
       <br />
-      FilterProvider repack jpeg_pack "$resp{Content-Type} = image/jpeg"<br />
-      FilterProvider repack gif_pack "$resp{Content-Type} = image/gif"<br />
-      FilterProvider repack png_pack "$resp{Content-Type} = image/png"<br />
+      FilterProvider repack jpeg_pack "%{CONTENT_TYPE} = 'image/jpeg'"<br />
+      FilterProvider repack gif_pack "%{CONTENT_TYPE} = 'image/gif'"<br />
+      FilterProvider repack png_pack "%{CONTENT_TYPE} = 'image/png'"<br />
       &lt;Location /image-filter&gt;<br />
       <span class="indent">
         FilterChain unpack downsample repack<br />
@@ -460,50 +460,8 @@
     <code>ap_register_output_filter</code>.
     </p>
 
-    <p><var>expression</var> can be any of the following:</p>
-    <dl>
-      <dt><code><var>string</var></code></dt>
-      <dd>true if <var>string</var> is not empty</dd>
-
-      <dt><code><var>string1</var> = <var>string2</var><br />
-      <var>string1</var> == <var>string2</var><br />
-      <var>string1</var> != <var>string2</var></code></dt>
-
-      <dd><p>Compare <var>string1</var> with <var>string2</var>. If
-      <var>string2</var> has the form <code>/<var>string2</var>/</code>
-      then it is treated as a regular expression. Regular expressions are
-      implemented by the <a href="http://www.pcre.org">PCRE</a> engine and
-      have the same syntax as those in <a href="http://www.perl.com">perl
-      5</a>. Note that <code>==</code> is just an alias for <code>=</code>
-      and behaves exactly the same way.</p>
-      </dd>
-
-      <dt><code><var>string1</var> &lt; <var>string2</var><br />
-       <var>string1</var> &lt;= <var>string2</var><br />
-       <var>string1</var> &gt; <var>string2</var><br />
-       <var>string1</var> &gt;= <var>string2</var></code></dt>
-
-      <dd>Compare <var>string1</var> with <var>string2</var>. Note, that
-      strings are compared <em>literally</em> (using
-      <code>strcmp(3)</code>). Therefore the string "100" is less than
-      "20".</dd>
-
-      <dt><code>( <var>expression</var> )</code></dt>
-      <dd>true if <var>expression</var> is true</dd>
-
-      <dt><code>! <var>expression</var></code></dt>
-      <dd>true if <var>expression</var> is false</dd>
-
-      <dt><code><var>expression1</var> &amp;&amp;
-        <var>expression2</var></code></dt>
-      <dd>true if both <var>expression1</var> and
-      <var>expression2</var> are true</dd>
-
-      <dt><code><var>expression1</var> ||
-        <var>expression2</var></code></dt>
-      <dd>true if either <var>expression1</var> or
-      <var>expression2</var> is true</dd>
-    </dl>
+    <p><var>expression</var> is described in the
+    <a href="../expr.html">ap_expr documentation</a>.</p>
 
 
 </div>
diff --git a/docs/manual/suexec.html.fr b/docs/manual/suexec.html.fr
index 91b98ffb68..18ab4ae0a4 100644
--- a/docs/manual/suexec.html.fr
+++ b/docs/manual/suexec.html.fr
@@ -24,8 +24,6 @@
 <a href="./ko/suexec.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a> |
 <a href="./tr/suexec.html" 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>
 
     <p>La fonctionnalité <strong>suEXEC</strong> permet
     l'exécution des programmes <strong>CGI</strong> et
@@ -400,7 +398,7 @@ de suEXEC</a></li>
 
       <dd>L'<a href="mod/mpm_common.html#user">utilisateur</a> sous
       lequel httpd s'exécute habituellement. C'est le seul utilisateur
-      autorisé à utiliser suexec.</dd>
+      autorisé à exécuter le wrapper suEXEC.</dd>
 
       <dt><code>--with-suexec-userdir=<em>DIR</em></code></dt>
 
diff --git a/docs/manual/suexec.xml.meta b/docs/manual/suexec.xml.meta
index f1be9d6399..ce2ceefd2d 100644
--- a/docs/manual/suexec.xml.meta
+++ b/docs/manual/suexec.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
     <variant outdated="yes">tr</variant>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index f2c8aed096..140de59570 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -211,6 +211,10 @@
         directive, review your configuration to make sure it is
         present in all the necessary directory contexts.</li>
 
+        <li><code class="module"><a href="./mod/mod_filter.html">mod_filter</a></code>: <code class="directive"><a href="./mod/filter.html#filterprovider">FilterProvider</a></code> syntax has changed and
+        now uses a boolean expression to determine if a filter is applied.
+        </li>
+
       </ul>
     
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index 11ec9a0873..3face72ac7 100644
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -21,6 +21,8 @@
 <p><span>Langues Disponibles: </span><a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/upgrading.html" title="Français">&nbsp;fr&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>
 
   <p>Afin d'assister les utilisateurs lors de leurs opérations de mise à
   jour, nous maintenons un document
diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr
index b7492a9c60..463da64e64 100644
--- a/docs/manual/upgrading.xml.fr
+++ b/docs/manual/upgrading.xml.fr
@@ -3,7 +3,7 @@
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
-<!-- English Revision: 1021924 -->
+<!-- English Revision: 1021924:1032413 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta
index 047fb80e5a..9dec7f53f9 100644
--- a/docs/manual/upgrading.xml.meta
+++ b/docs/manual/upgrading.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>