From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 10 Apr 2014 21:03:24 +0000 (+0000)
Subject: Add <compatibility> notes for changes made in version 2.4.4 + fix default value for... 
X-Git-Tag: 2.4.10~364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=956c758f805612d1976c44e3d73dd0287a460480;p=apache

Add <compatibility> notes for changes made in version 2.4.4 + fix default value for FallbackResource

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1586470 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index 623f5050b8..58119a66ed 100644
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -233,7 +233,7 @@ a directory</description>
 <name>FallbackResource</name>
 <description>Define a default URL for requests that don't map to a file</description>
 <syntax>FallbackResource disabled | <var>local-url</var></syntax>
-<default>None - httpd will return 404 (Not Found)</default>
+<default>disabled - httpd will return 404 (Not Found)</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>Indexes</override>
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 7f86088944..c9d00ae33e 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -459,17 +459,20 @@ Header merge Cache-Control no-store env=NO_STORE
         designed to expose the values obtained by <code>getloadavg()</code>
         and this represents the current load average, the 5 minute average, and
         the 15 minute average. The value is preceded by <code>l=</code> with each
-        average separated by <code>/</code>.
+        average separated by <code>/</code>.<br />
+        Available in 2.4.4 and later.
         </td></tr>
 
     <tr><td><code>%i</code></td>
         <td>The current idle percentage of httpd (0 to 100) based on available
-        processes and threads. The value is preceded by <code>i=</code>.
+        processes and threads. The value is preceded by <code>i=</code>.<br />
+        Available in 2.4.4 and later.
         </td></tr>
 
     <tr><td><code>%b</code></td>
         <td>The current busy percentage of httpd (0 to 100) based on available
-        processes and threads. The value is preceded by <code>b=</code>.
+        processes and threads. The value is preceded by <code>b=</code>.<br />
+        Available in 2.4.4 and later.
         </td></tr>
 
     <tr><td><code>%{VARNAME}e</code></td>
diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml
index 232f54302d..7519d3196a 100644
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -683,8 +683,7 @@ expressions</description>
     <syntax>BalancerPersist On|Off</syntax>
     <default>BalancerPersist Off</default>
     <contextlist><context>server config</context><context>virtual host</context></contextlist>
-    <compatibility>BalancerPersist is only available in Apache HTTP Server 2.4.4 and later.
-        and later.</compatibility>
+    <compatibility>BalancerPersist is only available in Apache HTTP Server 2.4.4 and later.</compatibility>
     <usage>
         <p>This directive will cause the shared memory storage associated
         with the balancers and balancer members to be persisted across
@@ -718,8 +717,7 @@ expressions</description>
     <syntax>BalancerInherit On|Off</syntax>
     <default>BalancerInherit On</default>
     <contextlist><context>server config</context><context>virtual host</context></contextlist>
-    <compatibility>BalancerInherit is only available in Apache HTTP Server 2.5.0
-        and later.</compatibility>
+    <compatibility>BalancerInherit is only available in Apache HTTP Server 2.4.5 and later.</compatibility>
     <usage>
         <p>This directive will cause the current server/vhost to "inherit" ProxyPass
             Balancers and Workers defined in the main server. This can cause issues and
@@ -1154,7 +1152,8 @@ ProxyPass /mirror/foo http://backend.example.com
         and it depends on the backend application server that support sessions.
         If the backend application server uses different name for cookies
         and url encoded id (like servlet containers) use | to to separate them.
-        The first part is for the cookie the second for the path.
+        The first part is for the cookie the second for the path.<br />
+        Available in Apache HTTP Server 2.4.4 and later.
     </td></tr>
     <tr><td>stickysessionsep</td>
         <td>"."</td>