From 14459b9d4ac00447fd2f99da48c6f8ea2d6a4c0e Mon Sep 17 00:00:00 2001
From: Mike Rumph <mrumph@apache.org>
Date: Mon, 24 Aug 2015 15:41:44 +0000
Subject: [PATCH] Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1697440 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/core.html.en           | 10 +++++-----
 docs/manual/mod/core.xml.de            |  2 +-
 docs/manual/mod/core.xml.es            |  2 +-
 docs/manual/mod/core.xml.fr            |  2 +-
 docs/manual/mod/core.xml.ja            |  2 +-
 docs/manual/mod/core.xml.meta          |  2 +-
 docs/manual/mod/core.xml.tr            |  2 +-
 docs/manual/mod/mod_proxy.html.en      |  6 ++++++
 docs/manual/mod/mod_proxy.xml.fr       |  2 +-
 docs/manual/mod/mod_proxy.xml.ja       |  2 +-
 docs/manual/mod/mod_proxy.xml.meta     |  2 +-
 docs/manual/mod/mod_substitute.html.en |  6 +++---
 docs/manual/mod/quickreference.html.en |  2 +-
 13 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 5583083dc5..99fd03326d 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -3697,11 +3697,11 @@ directory</td></tr>
         <p>It is safe to specify protocols that are unavailable/disabled. Such
         protocol names will simply be ignored.</p>
         
-        <p>Protocols specified in base servers and virtual hosts are concatenated
-            by appending the base ones, if there are configured protocols,
-            to the virtual host ones. Since protocols such as HTTP/2 allow
-            connection reuse under certain conditions, restricting protocols for
-            individual virtual hosts might not work as you expect it to.</p>
+        <p>Protocols specified in base servers are inherited for virtual hosts 
+            only if the virtual host has no own Protocols directive. Or, the other
+            way around, Protocols directives in virtual hosts replace any
+            such directive in the base server.
+        </p>
 
     
 <h3>See also</h3>
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 38fceb3251..8735c9d3a0 100644
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1695727 (outdated) -->
+<!-- English Revision: 344972:1697339 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es
index 0c1e045f06..0ef3f49a85 100644
--- a/docs/manual/mod/core.xml.es
+++ b/docs/manual/mod/core.xml.es
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1040494:1695727 (outdated) -->
+<!-- English Revision: 1040494:1697339 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr
index 66d1f0b52f..ec706eba40 100644
--- a/docs/manual/mod/core.xml.fr
+++ b/docs/manual/mod/core.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: 1695727 -->
+<!-- English Revision: 1695727:1697339 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 397b85207c..599d8a02c5 100644
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.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: 669847:1695727 (outdated) -->
+<!-- English Revision: 669847:1697339 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/core.xml.meta b/docs/manual/mod/core.xml.meta
index e78755527a..b9d96ee4c5 100644
--- a/docs/manual/mod/core.xml.meta
+++ b/docs/manual/mod/core.xml.meta
@@ -10,7 +10,7 @@
     <variant outdated="yes">de</variant>
     <variant>en</variant>
     <variant outdated="yes">es</variant>
-    <variant>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
     <variant outdated="yes">tr</variant>
   </variants>
diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr
index 0cf05f617a..1e1ecbf3f6 100644
--- a/docs/manual/mod/core.xml.tr
+++ b/docs/manual/mod/core.xml.tr
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 1302855:1695727 (outdated) -->
+<!-- English Revision: 1302855:1697339 (outdated) -->
 <!-- =====================================================
  Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
    Reviewed by: Orhan Berent <berent belgeler.org>
diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en
index 7b30cedb93..76dd493abe 100644
--- a/docs/manual/mod/mod_proxy.html.en
+++ b/docs/manual/mod/mod_proxy.html.en
@@ -496,6 +496,8 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre>
     Balancers available for a virtualhost in addition to the
     number pre-configured. It only takes effect if there is at
     least one pre-configured Balancer.</p>
+    <div class="warning">If/when the growth potential is reached, it is not
+    possible to configure a new balancer or the next restart would fail.</div>
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -1398,6 +1400,10 @@ ProxyPass "/mirror/foo"   "http://backend.example.com"</pre>
         <td>0</td>
         <td>Number of additional BalancerMembers to allow to be added
         to this balancer in addition to those defined at configuration.
+    <div class="warning"><h3>Note</h3>
+        <p>If/when the growth potential is reached, it is not possible to
+        configure a new BalancerMember or the next restart would fail.</p>
+    </div>
     </td></tr>
     <tr><td>forcerecovery</td>
         <td>On</td>
diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr
index 3b512b64b0..3218f6f4c7 100644
--- a/docs/manual/mod/mod_proxy.xml.fr
+++ b/docs/manual/mod/mod_proxy.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: 1696622 -->
+<!-- English Revision: 1696622:1697352 (outdated) -->
 <!-- French translation : Lucien GENTIS -->
 <!-- Reviewed by : Vincent Deffontaines -->
 
diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja
index 3e0767d8e6..6628e5c243 100644
--- a/docs/manual/mod/mod_proxy.xml.ja
+++ b/docs/manual/mod/mod_proxy.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: 344971:1696622 (outdated) -->
+<!-- English Revision: 344971:1697352 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta
index 38a79fdda7..f0185375d4 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>fr</variant>
+    <variant outdated="yes">fr</variant>
     <variant outdated="yes">ja</variant>
   </variants>
 </metafile>
diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en
index a0ce775e6a..37119b6465 100644
--- a/docs/manual/mod/mod_substitute.html.en
+++ b/docs/manual/mod/mod_substitute.html.en
@@ -134,7 +134,7 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"<
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Change the merge order of inherited patterns</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SubstituteInheritBefore on|off</code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SubstituteInheritBefore off</code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>SubstituteInheritBefore on</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
@@ -144,9 +144,9 @@ Substitute "s|http://internal.blog.example.com/|http://www.example.com/blog/|i"<
     <p>Whether to apply the inherited <code class="directive">Substitute</code>
     patterns first (<code>on</code>), or after the ones of the current
     context (<code>off</code>).
-    The former was the default in versions 2.4 and earlier, but changed
+    The latter was the default in versions 2.4 and earlier, but changed
     starting with 2.5, hence <code class="directive">SubstituteInheritBefore</code>
-    set to <code>on</code> allows to restore the legacy behaviour.
+    set to <code>off</code> allows to restore the legacy behaviour.
     <code class="directive">SubstituteInheritBefore</code> is itself inherited,
     hence contexts that inherit it (those that don't specify their own
     <code class="directive">SubstituteInheritBefore</code> value) will apply the
diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index 8f8ee6b08b..853f5e6b21 100644
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -1090,7 +1090,7 @@ Certificate verification</td></tr>
 <tr><td><a href="mpm_common.html#startservers">StartServers <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Number of child server processes created at startup</td></tr>
 <tr class="odd"><td><a href="mpm_common.html#startthreads">StartThreads <var>number</var></a></td><td></td><td>s</td><td>M</td></tr><tr class="odd"><td class="descr" colspan="4">Number of threads created on startup</td></tr>
 <tr><td><a href="mod_substitute.html#substitute">Substitute <var>s/pattern/substitution/[infq]</var></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Pattern to filter the response content</td></tr>
-<tr class="odd"><td><a href="mod_substitute.html#substituteinheritbefore">SubstituteInheritBefore on|off</a></td><td> off </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Change the merge order of inherited patterns</td></tr>
+<tr class="odd"><td><a href="mod_substitute.html#substituteinheritbefore">SubstituteInheritBefore on|off</a></td><td> on </td><td>dh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Change the merge order of inherited patterns</td></tr>
 <tr><td><a href="mod_substitute.html#substitutemaxlinelength">SubstituteMaxLineLength <var>bytes</var>(b|B|k|K|m|M|g|G)</a></td><td> 1m </td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Set the maximum line size</td></tr>
 <tr class="odd"><td><a href="mod_unixd.html#suexec">Suexec On|Off</a></td><td></td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Enable or disable the suEXEC feature</td></tr>
 <tr><td><a href="mod_suexec.html#suexecusergroup">SuexecUserGroup <em>User Group</em></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">User and group for CGI programs to run as</td></tr>
-- 
2.40.0