From 55cfc5cb4e7914ae23a49c5a3edfde0c2e202fd7 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Sun, 28 Nov 2010 16:40:54 +0000
Subject: [PATCH] update xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1039902 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/expr.html.en                   | 24 ++++++++++
 docs/manual/misc/relevant_standards.xml.ko |  2 +-
 docs/manual/mod/mod_dir.html.fr            | 12 +++++
 docs/manual/mod/mod_ldap.html.fr           | 56 +++++++++++++++++++---
 docs/manual/mod/mod_setenvif.html.en       |  8 ++--
 docs/manual/mod/mod_setenvif.xml.ja        |  2 +-
 docs/manual/mod/mod_setenvif.xml.ko        |  2 +-
 docs/manual/mod/mod_setenvif.xml.tr        |  2 +-
 docs/manual/mod/quickreference.html.de     |  2 +-
 docs/manual/mod/quickreference.html.en     |  2 +-
 docs/manual/mod/quickreference.html.es     |  2 +-
 11 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index a3d74ac47d..153d880694 100644
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -211,6 +211,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
     minus and at least two characters. The name is not case sensitive.
     Modules may register additional binary operators.</p>
 
+    <h3><a name="comp" id="comp">Comparison operators</a></h3>
+    
+
     <table class="bordered"><tr class="header"><th>Name</th><th>Alternative</th> <th>Description</th></tr>
 <tr><td><code>==</code></td>
         <td><code>=</code></td>
@@ -249,6 +252,24 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td><code>ge</code></td>
         <td>Integer greater than or equal</td></tr>
 </table>
+    
+
+    <h3><a name="binaryother" id="binaryother">Other binary operators</a></h3>
+    
+
+    <table class="bordered"><tr class="header"><th>Name</th><th>Description</th></tr>
+<tr><td><code>-ipmatch</code></td>
+        <td>IP address matches address/netmask</td></tr>
+<tr class="odd"><td><code>-strmatch</code></td>
+        <td>left string matches pattern given by right string (containing
+            wildcards *, ?, [])</td></tr>
+<tr><td><code>-strcmatch</code></td>
+        <td>same as <code>-strmatch</code>, but case insensitive</td></tr>
+<tr class="odd"><td><code>-fnmatch</code></td>
+        <td>same as <code>-strmatch</code>, but slashes are not matched by
+            wildcards</td></tr>
+</table>
+    
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -264,6 +285,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
         <td>String is not empty</td></tr>
 <tr class="odd"><td><code>-z</code></td>
         <td>String is empty</td></tr>
+<tr><td><code>-R</code></td>
+        <td>Same as "<code>%{REMOTE_ADDR} -ipmatch ...</code>", but more efficient
+        </td></tr>
 </table>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
diff --git a/docs/manual/misc/relevant_standards.xml.ko b/docs/manual/misc/relevant_standards.xml.ko
index e5d6d0bf50..b45a933265 100644
--- a/docs/manual/misc/relevant_standards.xml.ko
+++ b/docs/manual/misc/relevant_standards.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420993:785488 (outdated) -->
+<!-- English Revision: 420993:1039662 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_dir.html.fr b/docs/manual/mod/mod_dir.html.fr
index ca5429f72c..31ae6454a0 100644
--- a/docs/manual/mod/mod_dir.html.fr
+++ b/docs/manual/mod/mod_dir.html.fr
@@ -223,6 +223,18 @@ aucun fichier</td></tr>
     </code></p></div>
     <p>Les fichiers existants comme des images, des fichiers css, etc...
     seront traités normalement.</p>
+    <p>Pour un URI intermédiaire tel que
+    <em>http://example.com/blog/</em>, cet URI intermédiaire doit être
+    spécifié en tant que <var>url-locale</var> :</p>
+    <div class="example"><p><code>
+         <code>
+             &lt;Directory /web/example.com/htdocs/blog&gt;<br />
+	     <span class="indent">
+		     FallbackResource /blog/index.php<br />
+             </span>
+             &lt;/Directory&gt;
+         </code>
+    </code></p></div>
 
 </div>
 </div>
diff --git a/docs/manual/mod/mod_ldap.html.fr b/docs/manual/mod/mod_ldap.html.fr
index d3cd69d5a2..6fd2f588fd 100644
--- a/docs/manual/mod/mod_ldap.html.fr
+++ b/docs/manual/mod/mod_ldap.html.fr
@@ -519,13 +519,36 @@ connexion</td></tr>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="LDAPLibraryDebug" id="LDAPLibraryDebug">LDAPLibraryDebug</a> <a name="ldaplibrarydebug" id="ldaplibrarydebug">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable debugging in the LDAP SDK</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code /></td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Active le débogage dans le SDK LDAP</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LDAPLibraryDebug <var>7</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>disabled</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>
-</table>Documentation not yet translated. Please see English version of
-document.
+</table>
+    <p>Active les options de débogage LDAP spécifiques au SDK, qui
+    entraînent en général une journalisation d'informations verbeuses du
+    SDK LDAP dans le journal principal des erreurs d'Apache. Les
+    messages de traces en provenance du SDK LDAP fournissent des
+    informations très détaillées qui peuvent s'avérer utiles lors du
+    débogage des problèmes de connexion avec des serveurs LDAP
+    d'arrière-plan.</p>
+
+    <p>Cette option n'est configurable que lorsque le serveur HTTP
+    Apache est lié avec un SDK LDAP qui implémente
+    <code>LDAP_OPT_DEBUG</code> ou <code>LDAP_OPT_DEBUG_LEVEL</code>,
+    comme OpenLDAP (une valeur de 7 est verbeuse) ou Tivoli Directory
+    Server (une valeur de 65535 est verbeuse).</p>
+
+    <div class="warning">
+    <p>Les informations journalisées peuvent contenir des données
+    d'authentification en clair utilisées ou validées lors de
+    l'authentification LDAP ; vous devez donc prendre soin de protéger
+    et de purger le journal des erreurs lorsque cette directive est
+    utilisée.</p>
+    </div>
+    
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="LDAPOpCacheEntries" id="LDAPOpCacheEntries">LDAPOpCacheEntries</a> <a name="ldapopcacheentries" id="ldapopcacheentries">Directive</a></h2>
@@ -642,12 +665,31 @@ partag
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="LDAPTimeout" id="LDAPTimeout">LDAPTimeout</a> <a name="ldaptimeout" id="ldaptimeout">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Specifies the timeout for LDAP search and bind operations, in seconds</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code /></td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Spécifie le délai d'attente pour les opérations de
+recherche et d'identification LDAP en secondes</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntaxe:</a></th><td><code>LDAPTimeout <var>secondes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Défaut:</a></th><td><code>LDAPTimeout 60</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Contexte:</a></th><td>configuration du serveur</td></tr>
 <tr><th><a href="directive-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr>
-</table>Documentation not yet translated. Please see English version of document.
+</table>
+    <p>Cette directive permet de spécifier le délai d'attente pour les
+    opérations de recherche et d'identification, ainsi que l'option
+    LDAP_OPT_TIMEOUT dans la bibliothèque LDAP client sous-jacente,
+    lorsqu'elle est disponible.</p>
+
+    <p>Lorsque le délai est atteint, httpd va refaire un essai dans le
+    cas où une connexion existante a été silencieusement fermée par un
+    pare-feu. Les performances seront cependant bien meilleures si le
+    pare-feu est configuré pour envoyer des paquets TCP RST au lieu de
+    rejeter silencieusement les paquets.</p>
+
+    <div class="note">
+    <p>Les délais pour les opérations de comparaison LDAP nécessitent un
+    SDK avec LDAP_OPT_TIMEOUT, comme OpenLDAP &gt;= 2.4.4.</p>
+    </div>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="LDAPTrustedClientCert" id="LDAPTrustedClientCert">LDAPTrustedClientCert</a> <a name="ldaptrustedclientcert" id="ldaptrustedclientcert">Directive</a></h2>
diff --git a/docs/manual/mod/mod_setenvif.html.en b/docs/manual/mod/mod_setenvif.html.en
index 7c0373d3a6..4cf13b05c1 100644
--- a/docs/manual/mod/mod_setenvif.html.en
+++ b/docs/manual/mod/mod_setenvif.html.en
@@ -265,7 +265,7 @@ for additional examples.
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SetEnvIfExpr" id="SetEnvIfExpr">SetEnvIfExpr</a> <a name="setenvifexpr" id="setenvifexpr">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables based on an expression</td></tr>
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets environment variables based on an ap_expr expression</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SetEnvIfExpr <em>expr
     [!]env-variable</em>[=<em>value</em>]
     [[!]<em>env-variable</em>[=<em>value</em>]] ...</code></td></tr>
@@ -286,11 +286,11 @@ for additional examples.
     <p>This would set the environment variable <code>iso_delivered</code>
     every time our application attempts to send it via <code>X-Sendfile</code></p>
 
-    <p>For a more useful example, consider the <code>Referer</code>
-    example from above for a site with more than one domain:</p>
+    <p>A more useful example would be to set the variable rfc1918 if the
+    remote IP address is a private address according to RFC 1918:</p>
 
 <div class="example"><p><code>
-    SetEnvIfExpr "${HTTP_REFERER} in { 'www.example.com','example.com','w2.example3.org' }" intra_site_referral
+    SetEnvIfExpr "-R '10.0.0.0/8' || -R '172.16.0.0/12' || -R '192.168.0.0/16'" rfc1918
 </code></p></div>
 
 <h3>See also</h3>
diff --git a/docs/manual/mod/mod_setenvif.xml.ja b/docs/manual/mod/mod_setenvif.xml.ja
index 22ae86c67c..8e57e15f00 100644
--- a/docs/manual/mod/mod_setenvif.xml.ja
+++ b/docs/manual/mod/mod_setenvif.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: 658546:1037510 (outdated) -->
+<!-- English Revision: 658546:1039900 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_setenvif.xml.ko b/docs/manual/mod/mod_setenvif.xml.ko
index d10a7f0ae5..70210fd2ec 100644
--- a/docs/manual/mod/mod_setenvif.xml.ko
+++ b/docs/manual/mod/mod_setenvif.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:1037510 (outdated) -->
+<!-- English Revision: 151408:1039900 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_setenvif.xml.tr b/docs/manual/mod/mod_setenvif.xml.tr
index c133317c4d..1e54a113a6 100644
--- a/docs/manual/mod/mod_setenvif.xml.tr
+++ b/docs/manual/mod/mod_setenvif.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: 658546:1037510 (outdated) -->
+<!-- English Revision: 658546:1039900 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 0786292e80..4495945fc6 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -802,7 +802,7 @@ Dokumenten</td></tr>
 </td></tr>
 <tr><td><a href="mod_setenvif.html#setenvifexpr">SetEnvIfExpr <em>expr
     [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on an expression</td></tr>
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on an ap_expr expression</td></tr>
 <tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
     [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index b9e406a935..1b59c89aff 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -774,7 +774,7 @@ header</td></tr>
 </td></tr>
 <tr><td><a href="mod_setenvif.html#setenvifexpr">SetEnvIfExpr <em>expr
     [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on an expression</td></tr>
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on an ap_expr expression</td></tr>
 <tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
     [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es
index d1eda28125..5327445bf2 100644
--- a/docs/manual/mod/quickreference.html.es
+++ b/docs/manual/mod/quickreference.html.es
@@ -781,7 +781,7 @@ header</td></tr>
 </td></tr>
 <tr><td><a href="mod_setenvif.html#setenvifexpr">SetEnvIfExpr <em>expr
     [!]env-variable</em>[=<em>value</em>]
-    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on an expression</td></tr>
+    [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Sets environment variables based on an ap_expr expression</td></tr>
 <tr class="odd"><td><a href="mod_setenvif.html#setenvifnocase">SetEnvIfNoCase <em>attribute regex 
         [!]env-variable</em>[=<em>value</em>]
     [[!]<em>env-variable</em>[=<em>value</em>]] ...</a></td><td></td><td>svdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Sets environment variables based on attributes of the request
-- 
2.50.1