summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Jaillet <jailletc36@apache.org>2014-04-13 21:04:22 +0000
committerChristophe Jaillet <jailletc36@apache.org>2014-04-13 21:04:22 +0000
commit834dd9419fa2eece688c3eb2a07cb75f1f3b6fa2 (patch)
tree68ea05dd630072ee0ca262fd1c56018945ec638a
parent8359c0e6dae9d919510d956948f7f8057e2a1994 (diff)
downloadhttpd-834dd9419fa2eece688c3eb2a07cb75f1f3b6fa2.tar.gz
Add <compatibility> notes for changes made in version 2.4.7 + synch formating with 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1587098 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/manual/mod/mod_headers.xml12
-rw-r--r--docs/manual/mod/mod_ldap.xml10
-rw-r--r--docs/manual/mod/mod_logio.xml3
-rw-r--r--docs/manual/mod/mod_session_crypto.xml5
4 files changed, 18 insertions, 12 deletions
diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index c9d00ae33e..a51916b8e1 100644
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -259,7 +259,8 @@ Header merge Cache-Control no-store env=NO_STORE
<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=NO_STORE
<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=NO_STORE
<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=NO_STORE
<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>
diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml
index d1a85851dd..3a6b3d7360 100644
--- a/docs/manual/mod/mod_ldap.xml
+++ b/docs/manual/mod/mod_ldap.xml
@@ -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>
diff --git a/docs/manual/mod/mod_logio.xml b/docs/manual/mod/mod_logio.xml
index e7acb12940..6bbeafc671 100644
--- a/docs/manual/mod/mod_logio.xml
+++ b/docs/manual/mod/mod_logio.xml
@@ -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>
diff --git a/docs/manual/mod/mod_session_crypto.xml b/docs/manual/mod/mod_session_crypto.xml
index c2446c251d..dd8e7da98f 100644
--- a/docs/manual/mod/mod_session_crypto.xml
+++ b/docs/manual/mod/mod_session_crypto.xml
@@ -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