diff options
author | Daniel Stenberg <daniel@haxx.se> | 2020-06-09 16:08:11 +0200 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2020-06-10 08:49:17 +0200 |
commit | eab2f95c0de94e9816c8a6110d20673761dd97a4 (patch) | |
tree | 422e27ecb86fb1f74de1895b9a84c0a181e2799c /docs | |
parent | f54b6c4bc2f745fa32014819788c90126121729e (diff) |
wording: avoid blacklist/whitelist stereotypes
Instead of discussing if there's value or meaning (implied or not) in
the colors, let's use words without the same possibly negative
associations.
Closes #5546
Diffstat (limited to 'docs')
-rw-r--r-- | docs/CHECKSRC.md | 4 | ||||
-rw-r--r-- | docs/SSL-PROBLEMS.md | 2 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 | 20 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3 | 14 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 | 4 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 | 2 | ||||
-rw-r--r-- | docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 | 2 |
7 files changed, 24 insertions, 24 deletions
diff --git a/docs/CHECKSRC.md b/docs/CHECKSRC.md index 10e2f4d73..96150922b 100644 --- a/docs/CHECKSRC.md +++ b/docs/CHECKSRC.md @@ -9,7 +9,7 @@ check that it adheres to our [Source Code Style guide](CODE_STYLE.md). ## Command line options -`-W[file]` whitelists that file and excludes it from being checked. Helpful +`-W[file]` skip that file and excludes it from being checked. Helpful when, for example, one of the files is generated. `-D[dir]` directory name to prepend to file names when accessing them. @@ -158,5 +158,5 @@ instances are ignored and nothing extra. This is a method we've transitioned away from. Use inline ignores as far as possible. -Make a `checksrc.whitelist` file in the directory of the source code with the +Make a `checksrc.skip` file in the directory of the source code with the false positive, and include the full offending line into this file. diff --git a/docs/SSL-PROBLEMS.md b/docs/SSL-PROBLEMS.md index aaf7bdb59..35000cf76 100644 --- a/docs/SSL-PROBLEMS.md +++ b/docs/SSL-PROBLEMS.md @@ -78,7 +78,7 @@ depending on the OS or build configuration. The --ssl-no-revoke option was introduced in 7.44.0 to disable revocation checking but currently is only supported for Schannel (the native Windows SSL library), with an exception - in the case of Windows' Untrusted Publishers blacklist which it seems can't + in the case of Windows' Untrusted Publishers block list which it seems can't be bypassed. This option may have broader support to accommodate other SSL backends in the future. diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 b/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 index 405645080..da3251b62 100644 --- a/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 +++ b/docs/libcurl/opts/CURLMOPT_PIPELINING_SERVER_BL.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -22,7 +22,7 @@ .\" .TH CURLMOPT_PIPELINING_SERVER_BL 3 "4 Nov 2014" "libcurl 7.39.0" "curl_multi_setopt options" .SH NAME -CURLMOPT_PIPELINING_SERVER_BL \- pipelining server blacklist +CURLMOPT_PIPELINING_SERVER_BL \- pipelining server block list .SH SYNOPSIS #include <curl/curl.h> @@ -31,28 +31,28 @@ CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING_SERVER_BL, char * No function since pipelining was removed in 7.62.0. Pass a \fBservers\fP array of char *, ending with a NULL entry. This is a list -of server types prefixes (in the Server: HTTP header) that are blacklisted -from pipelining, i.e server types that are known to not support HTTP +of server types prefixes (in the Server: HTTP header) that are blocked from +pipelining, i.e server types that are known to not support HTTP pipelining. The array is copied by libcurl. Note that the comparison matches if the Server: header begins with the string -in the blacklist, i.e "Server: Ninja 1.2.3" and "Server: Ninja 1.4.0" can -both be blacklisted by having "Ninja" in the backlist. +in the block list, i.e "Server: Ninja 1.2.3" and "Server: Ninja 1.4.0" can +both be blocked by having "Ninja" in the list. -Pass a NULL pointer to clear the blacklist. +Pass a NULL pointer to clear the block list. .SH DEFAULT -The default value is NULL, which means that there is no blacklist. +The default value is NULL, which means that there is no block list. .SH PROTOCOLS .SH EXAMPLE .nf - server_blacklist[] = + char *server_block_list[] = { "Microsoft-IIS/6.0", "nginx/0.8.54", NULL }; - curl_multi_setopt(m, CURLMOPT_PIPELINING_SERVER_BL, server_blacklist); + curl_multi_setopt(m, CURLMOPT_PIPELINING_SERVER_BL, server_block_list); .fi .SH AVAILABILITY Added in 7.30.0 diff --git a/docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3 b/docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3 index 279d9ea57..5bb8a958e 100644 --- a/docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3 +++ b/docs/libcurl/opts/CURLMOPT_PIPELINING_SITE_BL.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -22,7 +22,7 @@ .\" .TH CURLMOPT_PIPELINING_SITE_BL 3 "4 Nov 2014" "libcurl 7.39.0" "curl_multi_setopt options" .SH NAME -CURLMOPT_PIPELINING_SITE_BL \- pipelining host blacklist +CURLMOPT_PIPELINING_SITE_BL \- pipelining host block list .SH SYNOPSIS #include <curl/curl.h> @@ -31,24 +31,24 @@ CURLMcode curl_multi_setopt(CURLM *handle, CURLMOPT_PIPELINING_SITE_BL, char **h No function since pipelining was removed in 7.62.0. Pass a \fBhosts\fP array of char *, ending with a NULL entry. This is a list -of sites that are blacklisted from pipelining, i.e sites that are known to not +of sites that are blocked from pipelining, i.e sites that are known to not support HTTP pipelining. The array is copied by libcurl. -Pass a NULL pointer to clear the blacklist. +Pass a NULL pointer to clear the block list. .SH DEFAULT -The default value is NULL, which means that there is no blacklist. +The default value is NULL, which means that there is no block list. .SH PROTOCOLS HTTP(S) .SH EXAMPLE .nf - site_blacklist[] = + char *site_block_list[] = { "www.haxx.se", "www.example.com:1234", NULL }; - curl_multi_setopt(m, CURLMOPT_PIPELINING_SITE_BL, site_blacklist); + curl_multi_setopt(m, CURLMOPT_PIPELINING_SITE_BL, site_block_list); .fi .SH AVAILABILITY Added in 7.30.0 diff --git a/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 b/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 index 84e1e8359..31677a128 100644 --- a/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 +++ b/docs/libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -65,7 +65,7 @@ additional \fIsetsockopt(2)\fP calls can of course be done on the socket at the user's discretion. A \fICURL_SOCKET_BAD\fP return value from the callback function will signal an unrecoverable error to libcurl and it will return \fICURLE_COULDNT_CONNECT\fP from the function that triggered this callback. -This return code can be used for IP address blacklisting. +This return code can be used for IP address block listing. If you want to pass in a socket with an already established connection, pass the socket back with this callback and then use diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 b/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 index fda45eddb..1812ea4f8 100644 --- a/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 +++ b/docs/libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 @@ -42,7 +42,7 @@ supported for DarwinSSL, NSS and OpenSSL. Tells libcurl to disable certificate revocation checks for those SSL backends where such behavior is present. This option is only supported for Schannel (the native Windows SSL library), with an exception in the case of Windows' -Untrusted Publishers blacklist which it seems can't be bypassed. (Added in +Untrusted Publishers block list which it seems can't be bypassed. (Added in 7.44.0) .IP CURLSSLOPT_NO_PARTIALCHAIN Tells libcurl to not accept "partial" certificate chains, which it otherwise diff --git a/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 b/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 index 3a2b88cc2..52b2817e9 100644 --- a/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 +++ b/docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 @@ -42,7 +42,7 @@ supported for DarwinSSL, NSS and OpenSSL. Tells libcurl to disable certificate revocation checks for those SSL backends where such behavior is present. This option is only supported for Schannel (the native Windows SSL library), with an exception in the case of Windows' -Untrusted Publishers blacklist which it seems can't be bypassed. (Added in +Untrusted Publishers block list which it seems can't be bypassed. (Added in 7.44.0) .IP CURLSSLOPT_NO_PARTIALCHAIN Tells libcurl to not accept "partial" certificate chains, which it otherwise |