Rebuild

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

15 files changed, 40 insertions, 19 deletions

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 68c8c6ec4e..df74db7fe4 100644
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -216,7 +216,7 @@ Header merge Cache-Control no-store env=NO_STORE
 <div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP response headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset|note
 <var>header</var> [<var>value</var>] [<var>replacement</var>]
 [early|env=[!]<var>variable</var>]|expr=<var>expression</var>]
 </code></td></tr>
@@ -315,6 +315,13 @@ Header merge Cache-Control no-store env=NO_STORE
     <dd>The response header of this name is removed, if it exists.
     If there are multiple headers of the same name, all will be
     removed. <var>value</var> must be omitted.</dd>
+
+    <dt><code>note</code></dt>
+    <dd>The value of the named response <var>header</var> is copied into an
+    internal note whose name is given by <var>value</var>.  This is useful
+    if a header sent by a CGI or proxied resource is configured to be unset
+    but should also be logged.</dd>
+
     </dl>
 
     <p>This argument is followed by a <var>header</var> name, which
diff --git a/docs/manual/mod/mod_headers.xml.fr b/docs/manual/mod/mod_headers.xml.fr
index 647c21ed03..631d1e93d1 100644
--- a/docs/manual/mod/mod_headers.xml.fr
+++ b/docs/manual/mod/mod_headers.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: 1389569:1496338 (outdated) -->
+<!-- English Revision: 1389569:1520908 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja
index a139de72d2..7ad7db2bf6 100644
--- a/docs/manual/mod/mod_headers.xml.ja
+++ b/docs/manual/mod/mod_headers.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: 151408:1496338 (outdated) -->
+<!-- English Revision: 151408:1520908 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_headers.xml.ko b/docs/manual/mod/mod_headers.xml.ko
index 40e20a5f45..06756d51f5 100644
--- a/docs/manual/mod/mod_headers.xml.ko
+++ b/docs/manual/mod/mod_headers.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: 151408:1496338 (outdated) -->
+<!-- English Revision: 151408:1520908 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en
index 2b93a382ca..e93d9848fc 100644
--- a/docs/manual/mod/mod_ldap.html.en
+++ b/docs/manual/mod/mod_ldap.html.en
@@ -622,7 +622,8 @@ valid</td></tr>
     explicitly configures the referral chasing in the underlying SDK.</p> 
     
   
-    <p><code class="directive">LDAPReferrals</code> takes the takes the following values:
+    <p><code class="directive">LDAPReferrals</code> takes the takes the following values:</p>
+
     <dl>
      <dt>"on"</dt>
      <dd> <p> When set to "on", the underlying SDK's referral chasing state
@@ -638,7 +639,6 @@ valid</td></tr>
               used to overide the SDK's hop limit, and no LDAP rebind callback is 
               registered.</p></dd>
     </dl>
-    </p>
 
     <p> The directive <code>LDAPReferralHopLimit</code> works in conjunction with
     this directive to limit the number of referral hops to follow before terminating the LDAP query.
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index 2714b44623..8cb27f02d9 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -522,7 +522,8 @@ valid</description>
     explicitly configures the referral chasing in the underlying SDK.</p> 
     
   
-    <p><directive>LDAPReferrals</directive> takes the takes the following values:
+    <p><directive>LDAPReferrals</directive> takes the takes the following values:</p>
+
     <dl>
      <dt>"on"</dt>
      <dd> <p> When set to "on", the underlying SDK's referral chasing state
@@ -538,7 +539,6 @@ valid</description>
               used to overide the SDK's hop limit, and no LDAP rebind callback is 
               registered.</p></dd>
     </dl>
-    </p>
 
     <p> The directive <code>LDAPReferralHopLimit</code> works in conjunction with
     this directive to limit the number of referral hops to follow before terminating the LDAP query.
diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en
index fd3e4314ec..ad72b1bc41 100644
--- a/docs/manual/mod/mod_lua.html.en
+++ b/docs/manual/mod/mod_lua.html.en
@@ -1054,6 +1054,17 @@ r.date_parse_rfc(string) -- Parses a date/time string and returns seconds since
 </pre>
 
 
+<pre class="prettyprint lang-lua">
+r:getcookie(key) -- Gets a HTTP cookie
+</pre>
+
+
+<pre class="prettyprint lang-lua">
+r:setcookie(key, value, secure, expires) -- Sets a HTTP cookie, for instance:
+r:setcookie("foo", "bar and stuff", false, os.time() + 86400)
+</pre>
+
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="logging" id="logging">Logging Functions</a></h2>
diff --git a/docs/manual/mod/mod_lua.xml.meta b/docs/manual/mod/mod_lua.xml.meta
index 8fc1a0efdf..b55c7710e9 100644
--- a/docs/manual/mod/mod_lua.xml.meta
+++ b/docs/manual/mod/mod_lua.xml.meta
@@ -8,6 +8,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant outdated="yes">fr</variant>
+    <variant>fr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_proxy_express.html.en b/docs/manual/mod/mod_proxy_express.html.en
index 82856872d9..c85a7bbef0 100644
--- a/docs/manual/mod/mod_proxy_express.html.en
+++ b/docs/manual/mod/mod_proxy_express.html.en
@@ -121,6 +121,7 @@
         </code></p></div>
 
       <div class="example"><h3>Configuration</h3><p><code>
+        ProxyExpressEnable on<br />
         ProxyExpressDBMFile emap<br />
         </code></p></div>
     </div>
diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en
index f84809b899..1feedb535a 100644
--- a/docs/manual/mod/mod_proxy_fcgi.html.en
+++ b/docs/manual/mod/mod_proxy_fcgi.html.en
@@ -44,8 +44,10 @@
     <p>Unlike <a href="http://httpd.apache.org/mod_fcgid/">mod_fcgid</a>
     and <a href="http://www.fastcgi.com/">mod_fastcgi</a>,
     <code class="module"><a href="../mod/mod_proxy_fcgi.html">mod_proxy_fcgi</a></code> has no provision for starting the
-    application process; <code class="program"><a href="../programs/fcgistarter.html">fcgistarter</a></code> is provided for
-    that purpose.</p>
+    application process; <code class="program"><a href="../programs/fcgistarter.html">fcgistarter</a></code> is provided
+    (on some platforms) for that purpose. Alternatively, external launching
+    or process management may be available in the FastCGI application
+    framework in use.</p>
 
     <div class="warning"><h3>Warning</h3>
       <p>Do not enable proxying until you have <a href="mod_proxy.html#access">secured your server</a>. Open proxy
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 0434e92e09..68fd6906b6 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -467,7 +467,7 @@ media type in the HTTP Content-Type header field</td></tr>
 will exit.</td></tr>
 <tr><td><a href="mod_unixd.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>B</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset|note
 <var>header</var> [<var>value</var>] [<var>replacement</var>]
 [early|env=[!]<var>variable</var>]|expr=<var>expression</var>]
 </a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index 87599415a6..319f6adc1d 100644
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -138,10 +138,10 @@
       to edit the response body with the full power of sed.</dd>
 
       <dt><code class="module"><a href="./mod/mod_auth_form.html">mod_auth_form</a></code></dt>
-      <dd>Allows to do form-based authentication.</dd>
+      <dd>Enables form-based authentication.</dd>
 
       <dt><code class="module"><a href="./mod/mod_session.html">mod_session</a></code></dt>
-      <dd>Allows to keep session state for clients, using cookie or
+      <dd>Enables the use of session state for clients, using cookie or
       database storage.</dd>
 
       <dt><code class="module"><a href="./mod/mod_allowmethods.html">mod_allowmethods</a></code></dt>
@@ -153,7 +153,7 @@
       for configuration and small business logic functions. (Experimental)</dd>
 
       <dt><code class="module"><a href="./mod/mod_log_debug.html">mod_log_debug</a></code></dt>
-      <dd>Allows to add customizable debug logging at different phases of the
+      <dd>Allows the addition of customizable debug logging at different phases of the
       request processing.</dd>
 
       <dt><code class="module"><a href="./mod/mod_buffer.html">mod_buffer</a></code></dt>
@@ -272,7 +272,7 @@
           <code class="directive"><a href="./mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to
           simplify common rewriting scenarios.</dd>
       <dd>Adds the possibility to use complex boolean expressions in <code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code>.</dd>
-      <dd>Allows to use SQL queries as <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> functions.</dd>
+      <dd>Allows the use of SQL queries as <code class="directive"><a href="./mod/mod_rewrite.html#rewritemap">RewriteMap</a></code> functions.</dd>
 
       <dt><code class="module"><a href="./mod/mod_ldap.html">mod_ldap</a></code>, <code class="module"><a href="./mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code></dt>
       <dd><code class="module"><a href="./mod/mod_authnz_ldap.html">mod_authnz_ldap</a></code> adds support for nested groups.</dd>
diff --git a/docs/manual/new_features_2_4.xml.fr b/docs/manual/new_features_2_4.xml.fr
index 93677f756d..3698382fbd 100644
--- a/docs/manual/new_features_2_4.xml.fr
+++ b/docs/manual/new_features_2_4.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 : 1426599 -->
+<!-- English Revision: 1426599:1521342 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/new_features_2_4.xml.meta b/docs/manual/new_features_2_4.xml.meta
index 065a31a35c..a21942ca60 100644
--- a/docs/manual/new_features_2_4.xml.meta
+++ b/docs/manual/new_features_2_4.xml.meta
@@ -8,7 +8,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">tr</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/new_features_2_4.xml.tr b/docs/manual/new_features_2_4.xml.tr
index da452ae76e..0e32de38cd 100644
--- a/docs/manual/new_features_2_4.xml.tr
+++ b/docs/manual/new_features_2_4.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.en.xsl"?>
-<!-- English Revision: 1291834:1426599 (outdated) -->
+<!-- English Revision: 1291834:1521342 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>