From d4a55d6a6308c6695e7ffc07344f22a03dc2dd5d Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Mon, 29 Oct 2012 20:35:02 +0000
Subject: [PATCH] xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1403484 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/expr.html.en | 32 +++++++++++++++++++-------------
 docs/manual/expr.xml.fr  |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index 27e6918b61..be221c0ce6 100644
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -139,7 +139,9 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
     <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>
+    directive accepting the expression. The <code>req_novary</code>
+    <a href="#functions">function</a> may be used to circumvent this
+    behavior.</p>
 
     <table class="bordered"><tr class="header"><th>Name</th></tr>
 <tr><td><code>HTTP_ACCEPT</code></td></tr>
@@ -408,29 +410,32 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 <tr><td><code>req</code>, <code>http</code></td>
         <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>
+<tr class="odd"><td><code>req_novary</code></td>
+        <td>Same as <code>req</code>, but header names will not be added to the
+            Vary header</td><td /></tr>
+<tr><td><code>resp</code></td>
         <td>Get HTTP response header</td><td /></tr>
-<tr><td><code>reqenv</code></td>
+<tr class="odd"><td><code>reqenv</code></td>
         <td>Lookup request environment variable</td><td /></tr>
-<tr class="odd"><td><code>osenv</code></td>
+<tr><td><code>osenv</code></td>
         <td>Lookup operating system environment variable</td><td /></tr>
-<tr><td><code>note</code></td>
+<tr class="odd"><td><code>note</code></td>
         <td>Lookup request note</td><td /></tr>
-<tr class="odd"><td><code>env</code></td>
+<tr><td><code>env</code></td>
         <td>Return first match of <code>note</code>, <code>reqenv</code>,
             <code>osenv</code></td><td /></tr>
-<tr><td><code>tolower</code></td>
+<tr class="odd"><td><code>tolower</code></td>
         <td>Convert string to lower case</td><td /></tr>
-<tr class="odd"><td><code>toupper</code></td>
+<tr><td><code>toupper</code></td>
         <td>Convert string to uppser case</td><td /></tr>
-<tr><td><code>escape</code></td>
+<tr class="odd"><td><code>escape</code></td>
         <td>Escape special characters in %hex encoding</td><td /></tr>
-<tr class="odd"><td><code>unescape</code></td>
+<tr><td><code>unescape</code></td>
         <td>Unescape %hex encoded string, leaving encoded slashes alone;
             return empty string if %00 is found</td><td /></tr>
-<tr><td><code>file</code></td>
+<tr class="odd"><td><code>file</code></td>
         <td>Read contents from a file</td><td>yes</td></tr>
-<tr class="odd"><td><code>filesize</code></td>
+<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>
 </table>
@@ -441,7 +446,8 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
     <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>
+    the expression. The <code>req_novary</code> function can be used to
+    prevent names from being added to the Vary header.</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
diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr
index c3b1b76fce..4dc486373e 100644
--- 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:1403476 (outdated) -->
+<!-- English Revision: 1362526:1403483 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
-- 
2.49.0