From: Daniel Gruno <humbedooh@apache.org>
Date: Tue, 19 Feb 2013 21:32:09 +0000 (+0000)
Subject: xforms
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2559d6f8c44f5f4b85bec3f652ab09dc5ae2e801;p=thirdparty%2Fapache%2Fhttpd.git

xforms

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

diff --git a/docs/man/httxt2dbm.1 b/docs/man/httxt2dbm.1
index 8298cdfc7c7..ed09c04c6e3 100644
--- a/docs/man/httxt2dbm.1
+++ b/docs/man/httxt2dbm.1
@@ -19,7 +19,7 @@
 .el .ne 3
 .IP "\\$1" \\$2
 ..
-.TH "HTTXT2DBM" 1 "2011-12-22" "Apache HTTP Server" "httxt2dbm"
+.TH "HTTXT2DBM" 1 "2013-02-19" "Apache HTTP Server" "httxt2dbm"
 
 .SH NAME
 httxt2dbm \- Generate dbm files for use with RewriteMap
@@ -35,6 +35,9 @@ httxt2dbm \- Generate dbm files for use with RewriteMap
 .PP
 httxt2dbm is used to generate dbm files from text input, for use in RewriteMap with the dbm map type\&.
  
+.PP
+If the output file already exists, it will not be truncated\&. New keys will be added and existing keys will be updated\&.
+ 
 
 .SH "OPTIONS"
  
diff --git a/docs/manual/developer/modguide.html.en b/docs/manual/developer/modguide.html.en
index c010adf02ca..808a276c1af 100644
--- a/docs/manual/developer/modguide.html.en
+++ b/docs/manual/developer/modguide.html.en
@@ -314,11 +314,11 @@ looks like
 <h3><a name="request_rec" id="request_rec">The request_rec structure</a></h3> 
 <p>The most essential part of any request is the <em>request record
 </em>. In a call to a handler function, this is represented by the <code>
-request_req* </code> structure passed along with every call that is made. 
+request_rec* </code> structure passed along with every call that is made. 
 This struct, typically just refered to as <code>r</code> in modules, 
 contains all the information you need for your module to fully process any 
 HTTP request and respond accordingly.</p> <p>Some key elements of the <code>
-request_req </code> structure are:
+request_rec </code> structure are:
 </p>
 <ul>
 <li><code>r-&gt;handler (char*):</code> Contains the name of the handler the server is currently asking to do the handling of this request</li>
@@ -333,7 +333,7 @@ request_req </code> structure are:
 "<a href="#memory">Memory management</a>" chapter.</li>
 </ul>
 <p>
-A complete list of all the values contained with in the <code>request_req</code> structure can be found in 
+A complete list of all the values contained with in the <code>request_rec</code> structure can be found in 
 the <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/include/httpd.h"><code>httpd.h</code></a> header 
 file or at <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/structrequest__rec.html">http://ci.apache.org/projects/httpd/trunk/doxygen/structrequest__rec.html</a>.
 </p>
@@ -428,7 +428,7 @@ the next, without informing other handlers.
 
 <ul>
 <li>
-    <code>ap_rputs(const char *string, request_req *r)</code>: <br />
+    <code>ap_rputs(const char *string, request_rec *r)</code>: <br />
     Sends a string of text to the client. This is a shorthand version of <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gac827cd0537d2b6213a7c06d7c26cc36e">
     ap_rwrite</a>.
     
@@ -454,7 +454,7 @@ the next, without informing other handlers.
 </li>
 <li>
     <code>
-    <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gaa2f8412c400197338ec509f4a45e4579">ap_set_content_type</a>(request_req *r, const char *type)</code>: <br />
+    <a href="http://ci.apache.org/projects/httpd/trunk/doxygen/group__APACHE__CORE__PROTO.html#gaa2f8412c400197338ec509f4a45e4579">ap_set_content_type</a>(request_rec *r, const char *type)</code>: <br />
     Sets the content type of the output you are sending.
     
 
@@ -1625,7 +1625,7 @@ typedef struct {
     const char* value;
 } keyValuePair;
 
-keyValuePair* readPost(request_req* r) {
+keyValuePair* readPost(request_rec* r) {
     apr_array_header_t *pairs = NULL;
     apr_off_t len;
     apr_size_t size;
@@ -1651,7 +1651,7 @@ keyValuePair* readPost(request_req* r) {
     return kvp;    
 }
 
-static int example_handler(request_req *r) 
+static int example_handler(request_rec *r) 
 {
     /*~~~~~~~~~~~~~~~~~~~~~~*/
     
@@ -1679,7 +1679,7 @@ static int example_handler(request_req *r)
 
 
 <pre class="prettyprint lang-c">
-static int example_handler(request_req *r) 
+static int example_handler(request_rec *r) 
 {
     /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
     const apr_array_header_t    *fields;
@@ -1741,7 +1741,7 @@ static int util_read(request_rec *r, const char **rbuf, apr_off_t *size)
     return(rc);
 }
 
-static int example_handler(request_req* r) 
+static int example_handler(request_rec* r) 
 {
     /*~~~~~~~~~~~~~~~~*/
     apr_off_t   size;
diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr
index 4df5d0744ae..a24bf22a5d4 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 : 1446028 -->
+<!-- English Revision: 1446028:1446027 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/howto/ssi.xml.meta b/docs/manual/howto/ssi.xml.meta
index 1c020635eb5..0d8deb802c3 100644
--- a/docs/manual/howto/ssi.xml.meta
+++ b/docs/manual/howto/ssi.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
diff --git a/docs/manual/mod/mod_authn_socache.html.en b/docs/manual/mod/mod_authn_socache.html.en
index 0117f76289e..16406352527 100644
--- a/docs/manual/mod/mod_authn_socache.html.en
+++ b/docs/manual/mod/mod_authn_socache.html.en
@@ -85,15 +85,17 @@ the load on backends</td></tr>
     <p>A simple usage example to accelerate <code class="module"><a href="../mod/mod_authn_dbd.html">mod_authn_dbd</a></code>
     using dbm as a cache engine:</p>
     <pre class="prettyprint lang-config">
+#AuthnCacheSOCache is optional.  If specified, it is server-wide
+AuthnCacheSOCache dbm
 &lt;Directory /usr/www/myhost/private&gt;
     AuthType Basic
     AuthName "Cached Authentication Example"
     AuthBasicProvider socache dbd
     AuthDBDUserPWQuery "SELECT password FROM authn WHERE user = %s"
     AuthnCacheProvideFor dbd
-    AuthnCacheContext dbd-authn-example
-    AuthnCacheSOCache dbm
     Require valid-user
+    #Optional
+    AuthnCacheContext dbd-authn-example
 &lt;/Directory&gt;
     </pre>
 
diff --git a/docs/manual/mod/mod_cache.xml.meta b/docs/manual/mod/mod_cache.xml.meta
index 29181a9f486..92f1aa14034 100644
--- a/docs/manual/mod/mod_cache.xml.meta
+++ b/docs/manual/mod/mod_cache.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">ko</variant>
   </variants>
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index f0185375d44..38a79fdda73 100644
--- a/docs/manual/mod/mod_proxy.xml.meta
+++ b/docs/manual/mod/mod_proxy.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/programs/httxt2dbm.html.en b/docs/manual/programs/httxt2dbm.html.en
index b4c6a2b85e3..cd7f642401d 100644
--- a/docs/manual/programs/httxt2dbm.html.en
+++ b/docs/manual/programs/httxt2dbm.html.en
@@ -27,8 +27,10 @@
 
     <p><code>httxt2dbm</code> is used to generate dbm files from text input, for
     use in <code class="directive"><a href="../mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> with the
-    <code>dbm</code> map type.
-    </p>
+    <code>dbm</code> map type.</p>
+    
+    <p>If the output file already exists, it will not be truncated. New keys will be
+    added and existing keys will be updated.</p>
 </div>
 <div id="quickview"><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#synopsis">Synopsis</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#options">Options</a></li>
diff --git a/docs/manual/programs/httxt2dbm.xml.meta b/docs/manual/programs/httxt2dbm.xml.meta
index 65e1ff3cb3b..c3d9815922d 100644
--- a/docs/manual/programs/httxt2dbm.xml.meta
+++ b/docs/manual/programs/httxt2dbm.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>tr</variant>
+    <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/programs/httxt2dbm.xml.tr b/docs/manual/programs/httxt2dbm.xml.tr
index 9cc97fead6c..ce00bf86dc5 100644
--- a/docs/manual/programs/httxt2dbm.xml.tr
+++ b/docs/manual/programs/httxt2dbm.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: 1229116 -->
+<!-- English Revision: 1229116:1442400 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta
index e4f3ee6f495..912229af035 100644
--- a/docs/manual/rewrite/flags.xml.meta
+++ b/docs/manual/rewrite/flags.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>