xforms

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

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index cdb928b6ef776329d1bd838ac7c484d7f115750e..27e6918b612d9aa89f1aefa38c941651290437f0 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 12a72550ad9ac1921c1bd8def00abe357618a413..787d31e8d532226e106c0eea979a6cc34684dc4b 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 f3d96b0626b9c9d8ace1c219e2e42ac5045acf58..c3b1b76fce4ee189e782c0275db7a6aeda72190d 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 : 1362526 -->
+<!-- English Revision: 1362526:1403476 (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/core.html.fr b/docs/manual/mod/core.html.fr
index 74dbca3d4088b3cdc7f24af16e153f089cd16dd1..eab68756f46040aa42e5db8d366cb40850b918ea 100644 (file)
--- a/docs/manual/mod/core.html.fr
+++ b/docs/manual/mod/core.html.fr
@@ -31,8 +31,6 @@
 <a href="../ja/mod/core.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../tr/mod/core.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>
 <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Fonctionnalités de base du serveur HTTP Apache toujours
 disponibles</td></tr>
 <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Core</td></tr></table>
@@ -822,6 +820,8 @@ DESACTIV
   Define servername www.example.com
   Define SSL
 &lt;/IfDefine&gt;
+
+    DocumentRoot /var/www/${servername}/htdocs
     </pre>
 
 

diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en
index 15b13af99d67397af039f040c8b6bfc12c783c79..dd9ba332d11cc49994e233249857f8548b296c99 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 b059a4b8003445c4874cd414689d1250790c1623..74b2a6de897b125d3108182346e724c21ce08ae4 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:1331035 (outdated) -->
+<!-- English Revision: 579425:1403476 (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 103f278f195d761995a0dccdb2e55bebfff54aed..0af3d181de125b9b8de395a44b660076f6cd0731 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:1331035 (outdated) -->
+<!-- English Revision: 105989:1403476 (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 6156189e3699a518996ea731ec4731dbc9b1b98a..c05bf3871c09e5302c1a2009990b98f2c6b3be41 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: 1310330:1331035 (outdated) -->
+<!-- English Revision: 1310330:1403476 (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 ad69bb7a8396b292ae26ef95d6d83eb07dd80129..5d235407538109b8023740290a0de4b4d7024995 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 eaa553702957f73be19caf99baeecd3a90e0fed3..f588aca4693aafedaa3b31f874937c223d8e4c2c 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 4310f9e03691db3b81ac3fc044659eeb224ee983..1fa5f42e7b4b700ca220450486c764b37cb71a6c 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 38f50561d68022e89e2c71926f22edca00edd03d..6df9d74517805371271f4c7ceb95a25918b9a324 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 : 1379836 -->
+<!-- English Revision: 1379836:1403476 (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/upgrading.html.fr b/docs/manual/upgrading.html.fr
index 650857e7c86fdf15e0c6beaaca97973c5116c49f..54e212b92f7aad220cb881ea28635feed81d4ba0 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 b548ca15c1d4b85e264031c570137977c20186db..da9946e852eaae13595c23244a317824156b1a71 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 : 1375996 -->
+<!-- English Revision: 1375996:1403041 (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>