xforms

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

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index 9cef1e98604df49f6b7ae526f2f893f4a98cbbd2..2fc2f8ce68bb97d27357e08e66fe393c585b54e4 100644 (file)
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -473,7 +473,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
         <td>Hash the string using SHA1, then encode the hash with hexadecimal
             encoding</td><td /></tr>
 <tr class="odd"><td><code>file</code></td>
-        <td>Read contents from a file</td><td>yes</td></tr>
+        <td>Read contents from a file (including line endings, when present)
+        </td><td>yes</td></tr>
 <tr><td><code>filesize</code></td>
         <td>Return size of a file (or 0 if file does not exist or is not
             regular file)</td><td>yes</td></tr>
@@ -525,7 +526,12 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
 # Only allow access to this content during business hours
 &lt;Directory "/foo/bar/business"&gt;
     Require expr %{TIME_HOUR} -gt 9 &amp;&amp; %{TIME_HOUR} -lt 17
-&lt;/Directory&gt;</pre>
+&lt;/Directory&gt;     
+
+# Check a HTTP header for a list of values
+&lt;If "%{HTTP:X-example-header} in { 'foo', 'bar', 'baz'}"&gt;
+    Header set matched true
+&lt;/If&gt;</pre>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
 <div class="section">
@@ -535,7 +541,7 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr
     <table class="bordered"><tr class="header"><th>Name</th><th>Alternative</th> <th>Description</th></tr>
 <tr><td><code>-in</code></td>
         <td><code>in</code></td>
-        <td>string contained in string list</td></tr>
+        <td>string contained in wordlist</td></tr>
 <tr class="odd"><td><code>/regexp/</code></td>
         <td><code>m#regexp#</code></td>
         <td>Regular expression (the second form allows different

diff --git a/docs/manual/mod/mod_cache_socache.html.en b/docs/manual/mod/mod_cache_socache.html.en
index a2fe9d308e7ae582de1b9336447118053274a8bd..e4cd057cf7d162a16394ff3f968959cb535cbd5e 100644 (file)
--- a/docs/manual/mod/mod_cache_socache.html.en
+++ b/docs/manual/mod/mod_cache_socache.html.en
@@ -156,7 +156,7 @@ cache</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="CacheSocacheMinTime" id="CacheSocacheMinTime">CacheSocacheMinTime</a> <a name="cachesocachemintime" id="cachesocachemintime">Directive</a></h2>
 <table class="directive">
-<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum time (in seconds) for a document to be placed in the
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The minimum time (in seconds) for a document to be placed in the
 cache</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>CacheSocacheMinTime <var>seconds</var></code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>CacheSocacheMinTime 600</code></td></tr>

diff --git a/docs/manual/mod/mod_cache_socache.xml.fr b/docs/manual/mod/mod_cache_socache.xml.fr
index 4bd88c1afc6dbcca0dac256a20b11093811d4c3b..2f7743deb382c29750a6cdf01c701ade91d9260f 100644 (file)
--- a/docs/manual/mod/mod_cache_socache.xml.fr
+++ b/docs/manual/mod/mod_cache_socache.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: 1554199 -->
+<!-- English Revision: 1554199:1637768 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 

diff --git a/docs/manual/mod/mod_cache_socache.xml.meta b/docs/manual/mod/mod_cache_socache.xml.meta
index dcf2d8995453d05000531751c5ef3cdb2ad9d7f7..6b54b885c6d29d0c2fc6e6c85f5d8d94513bcc73 100644 (file)
--- a/docs/manual/mod/mod_cache_socache.xml.meta
+++ b/docs/manual/mod/mod_cache_socache.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/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index c6af33f7af7081b8e1f57f918d0e0c7f64aa61f0..af3a5fe03feaf5638b7cfdcedf38107ff4794944 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -317,7 +317,7 @@ stored</td></tr>
 cache</td></tr>
 <tr class="odd"><td><a href="mod_cache_socache.html#cachesocachemaxtime">CacheSocacheMaxTime <var>seconds</var></a></td><td> 86400 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The maximum time (in seconds) for a document to be placed in the
 cache</td></tr>
-<tr><td><a href="mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime <var>seconds</var></a></td><td> 600 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The maximum time (in seconds) for a document to be placed in the
+<tr><td><a href="mod_cache_socache.html#cachesocachemintime">CacheSocacheMinTime <var>seconds</var></a></td><td> 600 </td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">The minimum time (in seconds) for a document to be placed in the
 cache</td></tr>
 <tr class="odd"><td><a href="mod_cache_socache.html#cachesocachereadsize">CacheSocacheReadSize <var>bytes</var></a></td><td> 0 </td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">The minimum size (in bytes) of the document to read and be cached
   before sending the data downstream</td></tr>

diff --git a/docs/manual/sections.html.en b/docs/manual/sections.html.en
index b24f940e5cd6ac9c94178fc0c8ea1c4a20783272..94cbae8904e3bb235fae72c0ef336bff7ce6915d 100644 (file)
--- a/docs/manual/sections.html.en
+++ b/docs/manual/sections.html.en
@@ -267,7 +267,7 @@ and URLs to be referenced from within <a href="expr.html">expressions</a>
 and modules like <code class="module"><a href="./mod/mod_rewrite.html">mod_rewrite</a></code>.</p>
 
 <pre class="prettyprint lang-config">&lt;DirectoryMatch ^/var/www/combined/(?&lt;SITENAME&gt;[^/]+)&gt;
-    require ldap-group cn=%{env:SITENAME},ou=combined,o=Example
+    require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
 &lt;/DirectoryMatch&gt;</pre>