Commit d8c74ccc authored by Luca Toscano's avatar Luca Toscano
Browse files

Sync with trunk the override suggestions for directives in:

mod_authn_socache.xml
mod_logio.xml
mod_ssl.xml

This caused two issues:

1) ./build.sh validate-xhtml failing due to xml validation
   failures for the string "Not applicable".
2) weird categories ('none', 'Not applicable', 'None') in
   overrides.html that don't make much sense.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1816356 13f79535-47bb-0310-9956-ffa450edef68
parent 913fb6cc
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ AuthnCacheSOCache dbm
<description>Enable Authn caching configured anywhere</description>
<syntax>AuthnCacheEnable</syntax>
<contextlist><context>server config</context></contextlist>
<override>None</override>

<usage>
    <p>This directive is not normally necessary: it is implied if
@@ -117,7 +116,6 @@ AuthnCacheSOCache dbm
<description>Select socache backend provider to use</description>
<syntax>AuthnCacheSOCache <var>provider-name[:provider-args]</var></syntax>
<contextlist><context>server config</context></contextlist>
<override>None</override>
<compatibility>Optional provider arguments are available in
Apache HTTP Server 2.4.7 and later</compatibility>

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@
<default>LogIOTrackTTFB OFF</default>
<contextlist><context>server config</context><context>virtual host</context>
<context>directory</context><context>.htaccess</context></contextlist>
<override>none</override>
<override>All</override>
<compatibility>Apache HTTP Server 2.4.13 and later</compatibility>

<usage>
+0 −3
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ SSLStrictSNIVHostCheck on
<description>Directory of PEM-encoded client certificates and keys to be used by the proxy</description>
<syntax>SSLProxyMachineCertificatePath <em>directory</em></syntax>
<contextlist><context>server config</context></contextlist>
<override>Not applicable</override>

<usage>
<p>
@@ -1769,7 +1768,6 @@ SSLProxyMachineCertificatePath "/usr/local/apache2/conf/proxy.crt/"
<description>File of concatenated PEM-encoded client certificates and keys to be used by the proxy</description>
<syntax>SSLProxyMachineCertificateFile <em>filename</em></syntax>
<contextlist><context>server config</context></contextlist>
<override>Not applicable</override>

<usage>
<p>
@@ -1797,7 +1795,6 @@ SSLProxyMachineCertificateFile "/usr/local/apache2/conf/ssl.crt/proxy.pem"
<description>File of concatenated PEM-encoded CA certificates to be used by the proxy for choosing a certificate</description>
<syntax>SSLProxyMachineCertificateChainFile <em>filename</em></syntax>
<contextlist><context>server config</context></contextlist>
<override>Not applicable</override>

<usage>
<p>