From 1312f9a891400c6589c816350703ab00da51523f Mon Sep 17 00:00:00 2001
From: Jacob Champion <jchampion@apache.org>
Date: Thu, 4 May 2017 23:41:16 +0000
Subject: [PATCH] override index: remove invalid <override>s from directives

Remove the bogus "none" and "n/a" type <override>s from the
documentation. If a directive can't be put in .htaccess, it shouldn't
have an <override> element.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1793933 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/manual/mod/mod_authn_socache.xml |  2 --
 docs/manual/mod/mod_logio.xml         |  1 -
 docs/manual/mod/mod_ssl.xml           | 16 ----------------
 3 files changed, 19 deletions(-)

diff --git a/docs/manual/mod/mod_authn_socache.xml b/docs/manual/mod/mod_authn_socache.xml
index 2edd5d6e4a..d47cdc1bc2 100644
--- a/docs/manual/mod/mod_authn_socache.xml
+++ b/docs/manual/mod/mod_authn_socache.xml
@@ -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>
 
diff --git a/docs/manual/mod/mod_logio.xml b/docs/manual/mod/mod_logio.xml
index 42096da75e..ea50f6df12 100644
--- a/docs/manual/mod/mod_logio.xml
+++ b/docs/manual/mod/mod_logio.xml
@@ -96,7 +96,6 @@
 <default>LogIOTrackTTFB OFF</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
-<override>none</override>
 <compatibility>Apache HTTP Server 2.4.13 and later</compatibility>
 
 <usage>
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml
index 374374f5da..ef5b30af8e 100644
--- a/docs/manual/mod/mod_ssl.xml
+++ b/docs/manual/mod/mod_ssl.xml
@@ -1739,7 +1739,6 @@ SSLStrictSNIVHostCheck on
 <syntax>SSLProxyMachineCertificatePath <em>directory</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -1768,7 +1767,6 @@ SSLProxyMachineCertificatePath "/usr/local/apache2/conf/proxy.crt/"
 <syntax>SSLProxyMachineCertificateFile <em>filename</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -1797,7 +1795,6 @@ SSLProxyMachineCertificateFile "/usr/local/apache2/conf/ssl.crt/proxy.pem"
 <syntax>SSLProxyMachineCertificateChainFile <em>filename</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -1831,7 +1828,6 @@ SSLProxyMachineCertificateChainFile "/usr/local/apache2/conf/ssl.crt/proxyCA.pem
 <default>SSLProxyVerify none</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 
@@ -1872,7 +1868,6 @@ Certificate verification</description>
 <default>SSLProxyVerifyDepth 1</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -1902,7 +1897,6 @@ SSLProxyVerifyDepth 10
 <default>SSLProxyCheckPeerExpire on</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -1926,7 +1920,6 @@ SSLProxyCheckPeerExpire on
 <default>SSLProxyCheckPeerCN on</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -1971,7 +1964,6 @@ SSLProxyCheckPeerName off
 <default>SSLProxyCheckPeerName on</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 <compatibility>Apache HTTP Server 2.4.5 and later</compatibility>
 
 <usage>
@@ -2011,7 +2003,6 @@ improvements.
 <default>SSLProxyEngine off</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -2046,7 +2037,6 @@ server to proxy SSL/TLS requests.</p>
 <default>SSLProxyProtocol all -SSLv3</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <!-- XXX Why does this have an override and not .htaccess context? -->
@@ -2068,7 +2058,6 @@ proxy handshake</description>
 <default>SSLProxyCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>Equivalent to <directive module="mod_ssl">SSLCipherSuite</directive>, but
@@ -2085,7 +2074,6 @@ Remote Server Auth</description>
 <syntax>SSLProxyCACertificatePath <em>directory-path</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -2113,7 +2101,6 @@ for Remote Server Auth</description>
 <syntax>SSLProxyCACertificateFile <em>file-path</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -2138,7 +2125,6 @@ Remote Server Auth</description>
 <syntax>SSLProxyCARevocationPath <em>directory-path</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -2166,7 +2152,6 @@ Remote Server Auth</description>
 <syntax>SSLProxyCARevocationFile <em>file-path</em></syntax>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
@@ -2192,7 +2177,6 @@ SSLProxyCARevocationFile "/usr/local/apache2/conf/ssl.crl/ca-bundle-remote-serve
 <default>SSLProxyCARevocationCheck none</default>
 <contextlist><context>server config</context> <context>virtual host</context>
 <context>proxy section</context></contextlist>
-<override>Not applicable</override>
 
 <usage>
 <p>
-- 
2.40.0