Return-Path: 
 <cvs-return-50372-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
X-Original-To: apmail-httpd-cvs-archive@www.apache.org
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 0F34A11FAE
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Thu, 10 Apr 2014 21:03:55 +0000 (UTC)
Received: (qmail 74784 invoked by uid 500); 10 Apr 2014 21:03:52 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 74352 invoked by uid 500); 10 Apr 2014 21:03:51 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 73511 invoked by uid 99); 10 Apr 2014 21:03:50 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Apr 2014 21:03:50 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Apr 2014 21:03:48 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AB47D2388868;
	Thu, 10 Apr 2014 21:03:25 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1586470 - in
 /httpd/httpd/branches/2.4.x/docs/manual/mod:
 mod_dir.xml mod_headers.xml mod_proxy.xml
Date: Thu, 10 Apr 2014 21:03:25 -0000
To: cvs@httpd.apache.org
From: jailletc36@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140410210325.AB47D2388868@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jailletc36
Date: Thu Apr 10 21:03:24 2014
New Revision: 1586470

URL: http://svn.apache.org/r1586470
Log:
Add <compatibility> notes for changes made in version 2.4.4 + fix default value for FallbackResource

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_dir.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_dir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_dir.xml?rev=1586470&r1=1586469&r2=1586470&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_dir.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_dir.xml Thu Apr 10 21:03:24 2014
@@ -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>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml?rev=1586470&r1=1586469&r2=1586470&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml Thu Apr 10 21:03:24 2014
@@ -459,17 +459,20 @@ Header merge Cache-Control no-store env=
         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>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1586470&r1=1586469&r2=1586470&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Thu Apr 10 21:03:24 2014
@@ -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.exa
         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>