xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1403488 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index 191c61ab8d1c3ea402fb5f83472db0c9ccf7097a..bef7c21188d193bf49079c6da71aa2d8861593c4 100644 (file)
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -52,6 +52,10 @@
     
       <p><a href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form">Backus-Naur Form</a> (BNF) is a notation
       technique for context-free grammars, often used to describe the syntax of languages used in computing.
+      In most cases, expressions are used to express boolean values.
+      For these, the starting boint in the BNF is <code>expr</code>. However, a few directives
+      like <code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code> accept expressions
+      that evaluate to a string value. For those, the starting boint in the BNF is <code>code</code>.
       </p>
 <blockquote>
 <pre>
@@ -132,7 +136,10 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
     <p>The following variables provide the values of the named HTTP request
     headers. The values of other headers can be obtained with the
-    <code>req</code> <a href="#functions">function</a>.</p>
+    <code>req</code> <a href="#functions">function</a>. Using these
+    variables may cause the header name to be added to the Vary
+    header of the HTTP response, except where otherwise noted for the
+    directive accepting the expression.</p>
 
     <table class="bordered"><tr class="header"><th>Name</th></tr>
 <tr><td><code>HTTP_ACCEPT</code></td></tr>
@@ -399,7 +406,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 
     <table class="bordered"><tr class="header"><th>Name</th><th>Description</th><th>Restricted</th></tr>
 <tr><td><code>req</code>, <code>http</code></td>
-        <td>Get HTTP request header</td><td /></tr>
+        <td>Get HTTP request header; header names may be added to the Vary
+            header, see below</td><td /></tr>
 <tr class="odd"><td><code>resp</code></td>
         <td>Get HTTP response header</td><td /></tr>
 <tr><td><code>reqenv</code></td>
@@ -430,6 +438,11 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
     <p>The functions marked as "restricted" are not available in some modules
     like <code class="module"><a href="./mod/mod_include.html">mod_include</a></code>.</p>
 
+    <p>When the functions <code>req</code> or <code>http</code> are used,
+    the header name will automatically be added to the Vary header of the
+    HTTP response, except where otherwise noted for the directive accepting
+    the expression.</p>
+
     <p>In addition to string-valued functions, there are also list-valued functions which
     take one string as argument and return a wordlist, i.e. a list of strings. The wordlist
     can be used with the special <code>-in</code> operator.

diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr
index aeeb0b5cde7e7eaf3edb6a978e9e555d4bd1061d..3f9d7a5e3b2981ab5ba17e4d12ce6f44506e063c 100644 (file)
--- a/docs/manual/expr.html.fr
+++ b/docs/manual/expr.html.fr
@@ -24,6 +24,8 @@
 <p><span>Langues Disponibles: </span><a href="./en/expr.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/expr.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>Historiquement, il existe de nombreuses variantes dans la syntaxe
     des expressions permettant d'exprimer une condition dans les

diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr
index 83b3c86aeb720e258a95756ad4bf25de49a0db1a..7a4e22dd55d5757bdaff90644929ecc4ab2263a9 100644 (file)
--- a/docs/manual/expr.xml.fr
+++ b/docs/manual/expr.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision : 1362527 -->
+<!-- English Revision: 1362527:1403486 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta
index d5a2e5e1a51ac2993572999fded854013f9172b5..ea324a8bb253d589dbddfb8780bc04583ce99ac0 100644 (file)
--- a/docs/manual/expr.xml.meta
+++ b/docs/manual/expr.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 6675782e20d87362c0507bdb4e08e25fdffea2a3..5537dd53d9c8d9b69e03c022985d6a63c5ff1150 100644 (file)
--- a/docs/manual/mod/mod_log_config.html.en
+++ b/docs/manual/mod/mod_log_config.html.en
@@ -428,7 +428,8 @@ CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b"
     clause) of a particular variable in the server
     <a href="../env.html">environment</a>. Alternatively, the condition
     can be expressed as arbitrary boolean <a href="../expr.html">expression</a>. If the condition is not satisfied, the request
-    will not be logged.</p>
+    will not be logged. References to HTTP headers  in the expression
+    will not cause the header names to be added to the Vary header.</p>
 
     <p>Environment variables can be set on a per-request
     basis using the <code class="module"><a href="../mod/mod_setenvif.html">mod_setenvif</a></code>

diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja
index bf6d538a933bf2b8a15ff024218b756c571e3a73..982aff4949f2eb140ceccbd9ff643e5607a10ffe 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.ja
+++ b/docs/manual/mod/mod_log_config.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: 579425:1334018 (outdated) -->
+<!-- English Revision: 579425:1403486 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_log_config.xml.ko b/docs/manual/mod/mod_log_config.xml.ko
index 640c7ae29b12168d1d8ebbdd2f7938e01ae3cb88..49b22c18422281987275073e7e4b60bdcf2665fd 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.ko
+++ b/docs/manual/mod/mod_log_config.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: 105989:1334018 (outdated) -->
+<!-- English Revision: 105989:1403486 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_log_config.xml.tr b/docs/manual/mod/mod_log_config.xml.tr
index 8ed455a7bdc86ce0b2a1745a5bacd2843b67085c..a75849a0f5551066d7e0f42a81fec0785df20674 100644 (file)
--- a/docs/manual/mod/mod_log_config.xml.tr
+++ b/docs/manual/mod/mod_log_config.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: 1310329:1334018 (outdated) -->
+<!-- English Revision: 1310329:1403486 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>

diff --git a/docs/manual/mod/mod_log_debug.html.en b/docs/manual/mod/mod_log_debug.html.en
index 77b80c85fc95f1e91eabe83c5d96e30a3e006da6..c6e53af60d7255f4416a2b2b461474574bfb26c8 100644 (file)
--- a/docs/manual/mod/mod_log_debug.html.en
+++ b/docs/manual/mod/mod_log_debug.html.en
@@ -110,8 +110,9 @@
 </table>
     <p>This directive causes a user defined message to be logged to the
     error log. The message can use variables and functions from the
-    <a href="../expr.html">ap_expr syntax</a>. The messages are logged at
-    loglevel info.</p>
+    <a href="../expr.html">ap_expr syntax</a>. References to HTTP headers
+    will not cause header names to be added to the Vary header. The
+    messages are logged at loglevel info.</p>
 
     <p>The hook specifies before which phase of request procesing the message
     will be logged. The following hooks are supported:</p>
@@ -137,7 +138,8 @@
 
     <p>The optional expression allows to restrict the message if a
     condition is met. The details of the expression syntax are described in
-    the <a href="../expr.html">ap_expr documentation</a>.</p>
+    the <a href="../expr.html">ap_expr documentation</a>. References to HTTP
+    headers will not cause the header names to be added to the Vary header.</p>
 
 
 </div>

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 21f9281c1fa57c27dd966eaf083b5b34d0657945..2d5a16501313cec30d267088a8e7e5868544bdb5 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -353,9 +353,11 @@ Alias /myapp /opt/myapp-1.2.3
         </li>
       </ul>
 
-      <p>If the <em>TestString</em> has the special value <code>expr</code>, the
-      <em>CondPattern</em> will be treated as an
-      <a href="../expr.html">ap_expr</a>.</p>
+      <p>If the <em>TestString</em> has the special value <code>expr</code>,
+      the <em>CondPattern</em> will be treated as an
+      <a href="../expr.html">ap_expr</a>. HTTP headers referenced in the
+      expression will be added to the Vary header if the <code>novary</code>
+      flag is not given.</p>
 
       <p>Other things you should be aware of:</p>
 

diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr
index 140d3b7f83f32e37203322646730fae27d4b94c1..ea54a577c31a2dc441063f24e5459341f1f1dc9e 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.fr
+++ b/docs/manual/mod/mod_rewrite.html.fr
@@ -27,6 +27,8 @@
 <p><span>Langues Disponibles: </span><a href="../en/mod/mod_rewrite.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../fr/mod/mod_rewrite.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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Ce module fournit un moteur de réécriture à base de
 règles permettant de réécrire les URLs des requêtes
 à la volée</td></tr>

diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr
index 5589c378078c289205e75aceb5cbc743f99868e1..d36b7881b2c73ab912587ac7b30dbde65d39df04 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml.fr
+++ b/docs/manual/mod/mod_rewrite.xml.fr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision : 1379929 -->
+<!-- English Revision: 1379929:1403486 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta
index decc0a7b1e85192770cea6f795335aaa7841b0f0..0be21e86f4d3e241aa6b35fcdd36de7efe6541b7 100644 (file)
--- a/docs/manual/mod/mod_rewrite.xml.meta
+++ b/docs/manual/mod/mod_rewrite.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/rewrite/remapping.html.en b/docs/manual/rewrite/remapping.html.en
index 0b97d283cfb0b054d640d20328ac7b1c4cc0ec84..d3ac42b4c776fb5e5d5ad4815b2ff447eb6da4a3 100644 (file)
--- a/docs/manual/rewrite/remapping.html.en
+++ b/docs/manual/rewrite/remapping.html.en
@@ -21,7 +21,8 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.4</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>Redirecting and Remapping with mod_rewrite</h1>
 <div class="toplang">
-<p><span>Available Languages: </span><a href="../en/rewrite/remapping.html" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/rewrite/remapping.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/rewrite/remapping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
 
 
@@ -642,7 +643,8 @@ file, as well as in a &lt;Directory&gt; block.</p>
 
 </div></div>
 <div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/rewrite/remapping.html" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/rewrite/remapping.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/rewrite/remapping.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 var comments_shortname = 'httpd';

diff --git a/docs/manual/rewrite/remapping.xml.meta b/docs/manual/rewrite/remapping.xml.meta
index ddeef59539b5caec10c4acfc4e810773844cf93a..fc4dfefebf26cb01ad30e3c557638c376e1308b4 100644 (file)
--- a/docs/manual/rewrite/remapping.xml.meta
+++ b/docs/manual/rewrite/remapping.xml.meta
@@ -8,5 +8,6 @@
 
   <variants>
     <variant>en</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/rewrite/rewritemap.html.en b/docs/manual/rewrite/rewritemap.html.en
index 44f3d062d950824dc3a752017914bd34dc985a20..ca21b26ddbda5f3d17d38b3b2006204bb13b095c 100644 (file)
--- a/docs/manual/rewrite/rewritemap.html.en
+++ b/docs/manual/rewrite/rewritemap.html.en
@@ -21,7 +21,8 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">HTTP Server</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="../">Version 2.4</a> &gt; <a href="./">Rewrite</a></div><div id="page-content"><div id="preamble"><h1>Using RewriteMap</h1>
 <div class="toplang">
-<p><span>Available Languages: </span><a href="../en/rewrite/rewritemap.html" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/rewrite/rewritemap.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/rewrite/rewritemap.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
 
 
@@ -452,7 +453,8 @@ RewriteMap myquery "fastdbd:SELECT destination FROM rewrite WHERE source = %s"
 
   </div></div>
 <div class="bottomlang">
-<p><span>Available Languages: </span><a href="../en/rewrite/rewritemap.html" title="English">&nbsp;en&nbsp;</a></p>
+<p><span>Available Languages: </span><a href="../en/rewrite/rewritemap.html" title="English">&nbsp;en&nbsp;</a> |
+<a href="../fr/rewrite/rewritemap.html" hreflang="fr" rel="alternate" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div class="top"><a href="#page-header"><img src="../images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
 var comments_shortname = 'httpd';

diff --git a/docs/manual/rewrite/rewritemap.xml.meta b/docs/manual/rewrite/rewritemap.xml.meta
index ac494a6c5c37fa1b45dea8ce3d11d33647ef1d7e..b77e9e616859e53cbd6bc2e85e816187bead9617 100644 (file)
--- a/docs/manual/rewrite/rewritemap.xml.meta
+++ b/docs/manual/rewrite/rewritemap.xml.meta
@@ -8,5 +8,6 @@
 
   <variants>
     <variant>en</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr
index 83c807d042b29c855dd5daba30d5940238e10821..fad55ad89341321a2442e7abd6bbba3f099a04ba 100644 (file)
--- a/docs/manual/upgrading.html.fr
+++ b/docs/manual/upgrading.html.fr
@@ -24,6 +24,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 c56a1ea173d331d74b429500e29279fea58c6a30..49c8c4cfb6ec81a7b87639b260d0a9166257cf3c 100644 (file)
--- 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 : 1375998 -->
+<!-- English Revision: 1375998:1403042 (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 aba29996bbd699aa0af1827543fc41d3c2d9af24..1d2a68a225aa2d153bd52b089461d6b5ec809b09 100644 (file)
--- 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>