From 10af5c16c7bb4d4938bebf5a6b5815772f99f1c5 Mon Sep 17 00:00:00 2001
From: Daniel Gruno <humbedooh@apache.org>
Date: Thu, 18 Apr 2013 16:17:19 +0000
Subject: [PATCH] xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1469406 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/man/fcgistarter.8                    |  6 +++---
 docs/manual/expr.html.en                  | 12 ++++++++++--
 docs/manual/mod/mod_macro.html.en         | 10 +++++-----
 docs/manual/programs/fcgistarter.html.en  |  4 ++--
 docs/manual/programs/fcgistarter.xml.fr   |  2 +-
 docs/manual/programs/fcgistarter.xml.meta |  4 ++--
 docs/manual/programs/fcgistarter.xml.tr   |  2 +-
 docs/manual/upgrading.html.en             |  4 ++++
 8 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/docs/man/fcgistarter.8 b/docs/man/fcgistarter.8
index 65fad86020..cb4e79c422 100644
--- a/docs/man/fcgistarter.8
+++ b/docs/man/fcgistarter.8
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "FCGISTARTER" 8 "2012-03-16" "Apache HTTP Server" "fcgistarter"
+.TH "FCGISTARTER" 8 "2013-04-18" "Apache HTTP Server" "fcgistarter"
 
 .SH NAME
 fcgistarter \- Start a FastCGI program
@@ -49,10 +49,10 @@ Currently only works on Unix systems\&.
 FastCGI program  
 .TP
 -p \fIport\fR
-Port which the program will listens on  
+Port which the program will listen on  
 .TP
 -i \fIinterface\fR
-Interface which the program will listens on  
+Interface which the program will listen on  
 .TP
 -N \fInum\fR
 Number of instances of the program  
diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en
index e1eaa0c3b2..f05ce49f6f 100644
--- a/docs/manual/expr.html.en
+++ b/docs/manual/expr.html.en
@@ -434,9 +434,17 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"
 <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 class="odd"><td><code>file</code></td>
+<tr class="odd"><td><code>base64</code></td>
+        <td>Encode the string using base64 encoding</td><td /></tr>
+<tr><td><code>unbase64</code></td>
+        <td>Decode base64 encoded string, return truncated string if 0x00 is
+            found</td><td /></tr>
+<tr class="odd"><td><code>sha1</code></td>
+        <td>Hash the string using SHA1, then encode the hash with hexadecimal
+            encoding</td><td /></tr>
+<tr><td><code>file</code></td>
         <td>Read contents from a file</td><td>yes</td></tr>
-<tr><td><code>filesize</code></td>
+<tr class="odd"><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>
diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en
index 050624632b..25b1acceb0 100644
--- a/docs/manual/mod/mod_macro.html.en
+++ b/docs/manual/mod/mod_macro.html.en
@@ -53,7 +53,7 @@
 <div class="section">
 <h2><a name="features" id="features">Features</a></h2>
 
-    Definition of a macro:
+ <p>Definition of a macro:</p>
     <ul>
     <li> macro definition within a &lt;Macro&gt; section, following
          the apache style.</li>
@@ -85,7 +85,7 @@
          backslash-continued independent lines.</p></li>
     </ul>
 
-    Use of a macro:
+    <p>Use of a macro:</p>
     <ul>
     <li> number of arguments must match the definition.</li>
     <li> all occurences of macro parameters are substituted by their values.</li>
@@ -98,10 +98,10 @@
     <li> <code>@</code>-prefixed parameters are escaped in quotes.</li>
     </ul>
 
-   Removal of a macro definition:
+   <p>Removal of a macro definition:</p>
    <ul>
    <li> the macro must be already defined.</li>
-   </ul>
+ </ul>
 
     <pre class="prettyprint lang-config">
 &lt;Macro DirGroup $dir $group&gt;
@@ -194,7 +194,7 @@ Use RestrictedAccessPolicy "192.54.172.0/24 192.54.148.0/24"
     </pre>
 
 
-    is equivalent, with the macros defined above, to:
+    <p>is equivalent, with the macros defined above, to:</p>
 
     <pre class="prettyprint lang-config">
 order deny,allow
diff --git a/docs/manual/programs/fcgistarter.html.en b/docs/manual/programs/fcgistarter.html.en
index ca12e39284..bbe0a19fa5 100644
--- a/docs/manual/programs/fcgistarter.html.en
+++ b/docs/manual/programs/fcgistarter.html.en
@@ -53,10 +53,10 @@
     <dd>FastCGI program</dd>
 
     <dt><code>-p <var>port</var></code></dt>
-    <dd>Port which the program will listens on</dd>
+    <dd>Port which the program will listen on</dd>
 
     <dt><code>-i <var>interface</var></code></dt>
-    <dd>Interface which the program will listens on</dd>
+    <dd>Interface which the program will listen on</dd>
 
     <dt><code>-N <var>num</var></code></dt>
     <dd>Number of instances of the program</dd>
diff --git a/docs/manual/programs/fcgistarter.xml.fr b/docs/manual/programs/fcgistarter.xml.fr
index 7a10c5b1fa..c9a529046a 100644
--- a/docs/manual/programs/fcgistarter.xml.fr
+++ b/docs/manual/programs/fcgistarter.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 : 1301728 -->
+<!-- English Revision: 1301728:1469400 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/programs/fcgistarter.xml.meta b/docs/manual/programs/fcgistarter.xml.meta
index 2aec6066d5..65b364969b 100644
--- a/docs/manual/programs/fcgistarter.xml.meta
+++ b/docs/manual/programs/fcgistarter.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">fr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/programs/fcgistarter.xml.tr b/docs/manual/programs/fcgistarter.xml.tr
index bf09afae65..c4b7dd833e 100644
--- a/docs/manual/programs/fcgistarter.xml.tr
+++ b/docs/manual/programs/fcgistarter.xml.tr
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1301728 -->
+<!-- English Revision: 1301728:1469400 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en
index a1585fe393..37ab369057 100644
--- a/docs/manual/upgrading.html.en
+++ b/docs/manual/upgrading.html.en
@@ -118,6 +118,10 @@
     <code class="directive"><a href="./mod/mod_authz_core.html#requirenone">RequireNone</a></code>, and
     <code class="directive"><a href="./mod/mod_authz_core.html#requireall">RequireAll</a></code>.</p>
 
+    <p>If you use <code class="module"><a href="./mod/mod_authz_dbm.html">mod_authz_dbm</a></code>, you must port your 
+    configuration to use <code>Require dbm-group ...</code> in place
+    of <code>Require group ...</code>.</p>
+
     <h4><a name="access" id="access">Access control</a></h4>
       
 
-- 
2.50.1