Return-Path: 
 <cvs-return-50393-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 2F728100B6
	for <apmail-httpd-cvs-archive@www.apache.org>;
 Sun, 13 Apr 2014 21:04:49 +0000 (UTC)
Received: (qmail 70698 invoked by uid 500); 13 Apr 2014 21:04:47 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 70657 invoked by uid 500); 13 Apr 2014 21:04:45 -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 70650 invoked by uid 99); 13 Apr 2014 21:04:45 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Apr 2014 21:04:45 +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; Sun, 13 Apr 2014 21:04:43 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 8529023889E1;
	Sun, 13 Apr 2014 21:04:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1587098 - in
 /httpd/httpd/branches/2.4.x/docs/manual/mod:
 mod_headers.xml mod_ldap.xml mod_logio.xml mod_session_crypto.xml
Date: Sun, 13 Apr 2014 21:04:23 -0000
To: cvs@httpd.apache.org
From: jailletc36@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20140413210423.8529023889E1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jailletc36
Date: Sun Apr 13 21:04:22 2014
New Revision: 1587098

URL: http://svn.apache.org/r1587098
Log:
Add <compatibility> notes for changes made in version 2.4.7 + synch formating with 2.4.x

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_headers.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.xml

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=1587098&r1=1587097&r2=1587098&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 Sun Apr 13 21:04:22 2014
@@ -259,7 +259,8 @@ Header merge Cache-Control no-store env=
 
     <dt><code>setifempty</code></dt>
     <dd>The request header is set, but only if there is no previous header
-    with this name. Available in 2.4.7 and later.</dd>
+    with this name.<br />
+    Available in 2.4.7 and later.</dd>
 
     <dt><code>unset</code></dt>
     <dd>The request header of this name is removed, if it exists. If
@@ -315,7 +316,8 @@ Header merge Cache-Control no-store env=
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>FileInfo</override>
-<compatibility>Default condition was temporarily changed to "always" in 2.3.9 and 2.3.10.  SetIfEmpty available since 2.4.7.</compatibility>
+<compatibility>Default condition was temporarily changed to "always" in 2.3.9 and 2.3.10.<br />
+SetIfEmpty and note available in 2.4.7 and later.</compatibility>
 
 <usage>
     <p>This directive can replace, merge or remove HTTP response
@@ -406,7 +408,8 @@ Header merge Cache-Control no-store env=
 
     <dt><code>setifempty</code></dt>
     <dd>The request header is set, but only if there is no previous header
-    with this name. Available in 2.4.7 and later.</dd>
+    with this name.<br />
+    Available in 2.4.7 and later.</dd>
 
     <dt><code>unset</code></dt>
     <dd>The response header of this name is removed, if it exists.
@@ -417,7 +420,8 @@ Header merge Cache-Control no-store env=
     <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>
+    but should also be logged.<br />
+    Available in 2.4.7 and later.</dd>
 
     </dl>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml?rev=1587098&r1=1587097&r2=1587098&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ldap.xml Sun Apr 13 21:04:22 2014
@@ -494,7 +494,7 @@ valid</description>
 <override>AuthConfig</override>
 
 <usage>
-    <p>This directive, if enabled by the <code>LDAPReferrals</code> directive,
+    <p>This directive, if enabled by the <directive>LDAPReferrals</directive> directive,
     limits the number of referral hops that are followed before terminating an
     LDAP query.</p>
 
@@ -511,6 +511,7 @@ valid</description>
 <default>LDAPReferrals On</default>
 <contextlist><context>directory</context><context>.htaccess</context></contextlist>
 <override>AuthConfig</override>
+<compatibility>The <var>default</var> parameter is available in Apache 2.4.7 and later</compatibility>
 
 <usage>
     <p>Some LDAP servers divide their directory among multiple domains and use referrals
@@ -519,8 +520,7 @@ valid</description>
     explicitly configures the referral chasing in the underlying SDK.</p>
 
 
-    <p><directive>LDAPReferrals</directive> takes the takes the following values:
-    </p>
+    <p><directive>LDAPReferrals</directive> takes the following values:</p>
     <dl>
      <dt>"on"</dt>
      <dd> <p> When set to "on", the underlying SDK's referral chasing state
@@ -537,10 +537,10 @@ valid</description>
               registered.</p></dd>
     </dl>
 
-    <p> The directive <code>LDAPReferralHopLimit</code> works in conjunction with
+    <p>The directive <directive>LDAPReferralHopLimit</directive> works in conjunction with
     this directive to limit the number of referral hops to follow before terminating the LDAP query.
     When referral processing is enabled by a value of "On", client credentials will be provided,
-    via a rebind callback, for any LDAP server requiring them. </p>
+    via a rebind callback, for any LDAP server requiring them.</p>
 </usage>
 </directivesynopsis>
 

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml?rev=1587098&r1=1587097&r2=1587098&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_logio.xml Sun Apr 13 21:04:22 2014
@@ -70,7 +70,8 @@
 
     <tr><td><code>%S</code></td>
         <td>Bytes transferred (received and sent), including request and headers,
-        cannot be zero. This is the combination of %I and %O.</td></tr>
+        cannot be zero. This is the combination of %I and %O.<br />
+        Available in Apache 2.4.7 and later</td></tr>
     </table>
 
     <p>Usually, the functionality is used like this:</p>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.xml?rev=1587098&r1=1587097&r2=1587098&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_session_crypto.xml Sun Apr 13 21:04:22 2014
@@ -175,8 +175,9 @@ SessionCryptoPassphrase secret
     secret to the end of the list, and once rolled out completely to all servers, remove
     the first key from the start of the list.</p>
 
-    <p>If the value begins with exec: the resulting command will be executed and the
-    first line returned to standard output by the program will be used as the key.</p>
+    <p>As of version 2.4.7 if the value begins with <var>exec:</var> the resulting command
+    will be executed and the first line returned to standard output by the program will be
+    used as the key.</p>
 <example><pre>
 #key used as-is
 SessionCryptoPassphrase secret