From: Jim Jagielski <jim@apache.org>
Date: Tue, 9 Feb 2016 12:18:23 +0000 (+0000)
Subject: xforms
X-Git-Tag: 2.5.0-alpha~2164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=742811b2c93bb8c1a73ca43611f75fb279b3a0ab;p=thirdparty%2Fapache%2Fhttpd.git

xforms


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

diff --git a/docs/manual/expr.html.fr b/docs/manual/expr.html.fr
index d03de18fa24..2993a955507 100644
--- a/docs/manual/expr.html.fr
+++ b/docs/manual/expr.html.fr
@@ -23,7 +23,8 @@
 <div id="path">
 <a href="http://www.apache.org/">Apache</a> &gt; <a href="http://httpd.apache.org/">Serveur HTTP</a> &gt; <a href="http://httpd.apache.org/docs/">Documentation</a> &gt; <a href="./">Version 2.5</a></div><div id="page-content"><div id="preamble"><h1>Les expressions dans le serveur HTTP Apache</h1>
 <div class="toplang">
-<p><span>Langues Disponibles: </span><a href="./en/expr.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<p><span>Langues Disponibles: </span><a href="./edited/expr.html" hreflang="edited" rel="alternate" title="">&nbsp;edited&nbsp;</a> |
+<a href="./en/expr.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/expr.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div>
 
@@ -651,7 +652,8 @@ Header always set CustomHeader my-value "expr=%{REQUEST_URI} =~ m#^/special_path
     de la version 2.5.0 du serveur HTTP Apache.</p>
 </div></div>
 <div class="bottomlang">
-<p><span>Langues Disponibles: </span><a href="./en/expr.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
+<p><span>Langues Disponibles: </span><a href="./edited/expr.html" hreflang="edited" rel="alternate" title="">&nbsp;edited&nbsp;</a> |
+<a href="./en/expr.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="./fr/expr.html" title="Français">&nbsp;fr&nbsp;</a></p>
 </div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Commentaires</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&amp;A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
 <script type="text/javascript"><!--//--><![CDATA[//><!--
diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta
index d5a2e5e1a51..baaa5f7830c 100644
--- a/docs/manual/expr.xml.meta
+++ b/docs/manual/expr.xml.meta
@@ -7,6 +7,7 @@
   <relpath>.</relpath>
 
   <variants>
+    <variant>edited</variant>
     <variant>en</variant>
     <variant>fr</variant>
   </variants>
diff --git a/docs/manual/mod/mod_proxy_hcheck.html.en b/docs/manual/mod/mod_proxy_hcheck.html.en
index 44525ea9947..7dcb6661cb5 100644
--- a/docs/manual/mod/mod_proxy_hcheck.html.en
+++ b/docs/manual/mod/mod_proxy_hcheck.html.en
@@ -48,6 +48,11 @@
   	BalancerMember parameters, which are configured in the standard
   	way via <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>:</p>
 
+  <p>A new BalancerMember status state (flag) is defined via this module: "<code>C</code>".
+     When the worker is taken offline due to failures as determined by the health
+     check module, this flag is set, and can be seen (and modified) via the
+     <code>balancer-manager</code>.</p>
+
     <table>
     <tr><th>Parameter</th>
         <th>Default</th>