From: Rich Bowen <rbowen@apache.org>
Date: Sat, 6 Jun 2020 18:15:02 +0000 (+0000)
Subject: Remove 'blacklist' from our docs, as per
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6984a8986a51db2345d2ca31031901f5c91818a;p=thirdparty%2Fapache%2Fhttpd.git

Remove 'blacklist' from our docs, as per
https://lethargy.org/~jesus/writes/a-guide-to-nomenclature-selection/
and other excellent resources.


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

diff --git a/docs/manual/compliance.xml b/docs/manual/compliance.xml
index ddef10098ad..9dd1164ab91 100644
--- a/docs/manual/compliance.xml
+++ b/docs/manual/compliance.xml
@@ -483,7 +483,7 @@
 
     <p>This policy will be rejected if the server response contains a
     <code>Vary</code> header, and that header in turn contains a header
-    blacklisted by the administrator.</p>
+    forbidden by the administrator.</p>
 
     <p>The <code>Vary</code> header is described in full in
     <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.44">
diff --git a/docs/manual/howto/http2.xml b/docs/manual/howto/http2.xml
index 3f4b63c7f36..1e39b783a16 100644
--- a/docs/manual/howto/http2.xml
+++ b/docs/manual/howto/http2.xml
@@ -129,7 +129,7 @@ Protocols http/1.1
     cipher suite will force it to simply refuse and fall back to HTTP 1.1. This is a common mistake
     that is done while configuring httpd for HTTP/2 the first time, so please keep it in mind to avoid
     long debugging sessions! If you want to be sure about the cipher suite to choose please avoid
-    the ones listed in the <a href="http://httpwg.org/specs/rfc7540.html#BadCipherSuites">HTTP/2 TLS blacklist</a>.</p>
+    the ones listed in the <a href="http://httpwg.org/specs/rfc7540.html#BadCipherSuites">HTTP/2 TLS reject list</a>.</p>
     </note>
     <p>The order of protocols mentioned is also relevant. By default, the first one is the 
     most preferred protocol. When a client offers multiple choices, the one most to the 
diff --git a/docs/manual/rewrite/access.xml b/docs/manual/rewrite/access.xml
index 647f20c81dc..e214ea7a4e3 100644
--- a/docs/manual/rewrite/access.xml
+++ b/docs/manual/rewrite/access.xml
@@ -206,13 +206,13 @@ SetEnvIfNoCase User-Agent ^NameOfBadRobot goaway
 
 <section id="host-deny">
 
-  <title>Denying Hosts in a Blacklist</title>
+  <title>Denying Hosts in a Reject List</title>
 
   <dl>
     <dt>Description:</dt>
 
     <dd>
-      <p>We wish to maintain a blacklist of hosts, rather like
+      <p>We wish to maintain a list of hosts, rather like
       <code>hosts.deny</code>, and have those hosts blocked from
       accessing our server.</p>
     </dd>