From: Rich Bowen
Date: Sat, 6 Jun 2020 18:19:26 +0000 (+0000)
Subject: Remove 'blacklist' from our documentation, as per
X-Git-Tag: 2.4.44~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d8259bcc75f812ef1e547571832d11de947491;p=thirdparty%2Fapache%2Fhttpd.git
Remove 'blacklist' from our documentation, as per
https://lethargy.org/~jesus/writes/a-guide-to-nomenclature-selection/
and other recommendations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1878549 13f79535-47bb-0310-9956-ffa450edef68
---
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 HTTP/2 TLS blacklist.
+ the ones listed in the HTTP/2 TLS reject list.
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 fcd924d762b..745957c87a2 100644
--- a/docs/manual/rewrite/access.xml
+++ b/docs/manual/rewrite/access.xml
@@ -206,13 +206,13 @@ SetEnvIfNoCase User-Agent "^NameOfBadRobot" goaway
- Denying Hosts in a Blacklist
+ Denying Hosts in a Reject List
- Description:
-
-
We wish to maintain a blacklist of hosts, rather like
+
We wish to maintain a list of hosts, rather like
hosts.deny
, and have those hosts blocked from
accessing our server.