Add <compatibility> notes for changes made in version 2.4.4 + synch formating with...

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1586471 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index dc855bd234a9fe26551387c16992bb39c60f22d7..f9384bdcb75bda7f0b73c03cb9b1985cf12aa494 100644 (file)
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -149,14 +149,14 @@ a directory</description>
     >DirectoryIndexRedirect</directive> causes an external redirect
     to instead be issued.</p>
 
-    <p> The argument can be : </p>
+    <p>The argument can be:</p>
     <ul>
-     <li><code>on</code> : issues a 302 redirection to the index resource.</li>
-     <li><code>off</code> : does not issue a redirection. This is the legacy behaviour of mod_dir.</li>
-     <li><code>permanent</code> : issues a 301 (permanent) redirection to the index resource.</li>
-     <li><code>temp</code> : this has the same effect as <code>on</code></li>
-     <li><code>seeother</code> : issues a 303 redirection (also known as "See Other") to the index resource.</li>
-     <li><var>3xx-code</var> : issues a redirection marked by the chosen 3xx code.</li>
+     <li><code>on</code>: issues a 302 redirection to the index resource.</li>
+     <li><code>off</code>: does not issue a redirection. This is the legacy behaviour of mod_dir.</li>
+     <li><code>permanent</code>: issues a 301 (permanent) redirection to the index resource.</li>
+     <li><code>temp</code>: this has the same effect as <code>on</code></li>
+     <li><code>seeother</code>: issues a 303 redirection (also known as "See Other") to the index resource.</li>
+     <li><var>3xx-code</var>: issues a redirection marked by the chosen 3xx code.</li>
     </ul>
 
 
@@ -237,6 +237,8 @@ a directory</description>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>Indexes</override>
+<compatibility>The <code>disabled</code> argument is available in version 2.4.4 and
+later</compatibility>
 <usage>
     <p>Use this to set a handler for any URL that doesn't map to anything
     in your filesystem, and would otherwise return HTTP 404 (Not Found).

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml
index 3115ed0cc516efd146cd1a3a9a5b71f25dbfe6d1..d090b18e797da7404335d2ec005a292cfaf3f047 100644 (file)
--- a/docs/manual/mod/mod_headers.xml
+++ b/docs/manual/mod/mod_headers.xml
@@ -256,7 +256,7 @@ Header merge Cache-Control no-store env=NO_STORE
     <dt><code>set</code></dt>
     <dd>The request header is set, replacing any previous header
     with this name</dd>
-  
+
     <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>
@@ -308,7 +308,7 @@ Header merge Cache-Control no-store env=NO_STORE
 <directivesynopsis>
 <name>Header</name>
 <description>Configure HTTP response headers</description>
-<syntax>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|unset|note
+<syntax>Header [<var>condition</var>] add|append|echo|edit|edit*|merge|set|setifempty|unset|note
 <var>header</var> [<var>[expr=]value]</var>] [<var>replacement</var>]
 [early|env=[!]<var>variable</var>]|expr=<var>expression</var>]
 </syntax>
@@ -462,17 +462,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 1b77507f0e25fb976041e5eef7adcb9929fed219..26a8bf89ce44f686f9088d3436e9a9ae7eef3fa5 100644 (file)
--- a/docs/manual/mod/mod_proxy.xml
+++ b/docs/manual/mod/mod_proxy.xml
@@ -700,8 +700,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.5.0
-        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
@@ -735,8 +734,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.4.4 and later.
-        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"
             Balancers and Workers defined in the main server. This can cause issues and
@@ -1176,7 +1174,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>

diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index e6cb40750690c26c5986eabc0b4a534dd59da4b1..2f4a6cfb1784f0609ccdd8fba3830d02e63dd5d2 100644 (file)
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1248,6 +1248,9 @@ SSLVerifyDepth 10
 <syntax>SSLSRPVerifierFile <em>file-path</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
+<compatibility>Available in httpd 2.4.4 and later, if using OpenSSL 1.0.1 or
+later</compatibility>
+
 
 <usage>
 <p>
@@ -1275,6 +1278,8 @@ avalable in the <code>SSL_SRP_USERINFO</code> request environment variable.</p>
 <syntax>SSLSRPUnknownUserSeed <em>secret-string</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
+<compatibility>Available in httpd 2.4.4 and later, if using OpenSSL 1.0.1 or
+later</compatibility>
 
 <usage>
 <p>