From: Derrick Stolee <derrickstolee@xxxxxxxxxx> The word "whitelist" has cultural implications that are not inclusive. Thankfully, it is not difficult to reword and avoid its use. Remove uses of "whitelist" in the Documentation/ directory. In all cases, we can rewrite the sentences to add clarity instead of relying on the reader understanding this term. The most substantial change is to git-daemon.txt which had several uses, but we can refer to the input directories as a list of included directories, making the descriptions slightly simpler. Helped-by: Jeff King <peff@xxxxxxxx> Helped-by: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: Derrick Stolee <derrickstolee@xxxxxxxxxx> --- Documentation/git-cvsserver.txt | 2 +- Documentation/git-daemon.txt | 15 +++++++-------- Documentation/git.txt | 3 +-- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 4dc57ed2547..e90b03402a5 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -313,7 +313,7 @@ circumstances, allowing easier restricted usage through git-shell. GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path. -GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The +GIT_CVSSERVER_ROOT specifies a single allowed directory. The repository must still be configured to allow access through git-cvsserver, as described above. diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index fdc28c041c7..7a0539cb411 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -32,8 +32,8 @@ that service if it is enabled. It verifies that the directory has the magic file "git-daemon-export-ok", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `--export-all` parameter is specified). If you -pass some directory paths as 'git daemon' arguments, you can further restrict -the offers to a whitelist comprising of those. +pass some directory paths as 'git daemon' arguments, the offers are limited to +repositories within those directories. By default, only `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked @@ -50,7 +50,7 @@ OPTIONS Match paths exactly (i.e. don't allow "/foo/repo" when the real path is "/foo/repo.git" or "/foo/repo/.git") and don't do user-relative paths. 'git daemon' will refuse to start when this option is enabled and no - whitelist is specified. + specific directories are specified. --base-path=<path>:: Remap all the path requests as relative to the given path. @@ -73,7 +73,7 @@ OPTIONS %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository. After interpolation, the path is validated against the directory - whitelist. + list. --export-all:: Allow pulling from all directories that look like Git repositories @@ -218,7 +218,7 @@ standard output to be sent to the requestor as an error message when it declines the service. <directory>:: - A directory to add to the whitelist of allowed directories. Unless + A directory to add to the list of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory. @@ -264,9 +264,8 @@ git 9418/tcp # Git Version Control System 'git daemon' as inetd server:: To set up 'git daemon' as an inetd service that handles any - repository under the whitelisted set of directories, /pub/foo - and /pub/bar, place an entry like the following into - /etc/inetd all on one line: + repository in the directory list of `/pub/foo` and `/pub/bar`, + place an entry like the following into `/etc/inetd` all on one line: + ------------------------------------------------ git stream tcp nowait nobody /usr/bin/git diff --git a/Documentation/git.txt b/Documentation/git.txt index 302607a4967..dd5061563eb 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -886,8 +886,7 @@ for full details. `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any - protocol not mentioned will be disallowed (i.e., this is a - whitelist, not a blacklist). See the description of + protocol not mentioned will be disallowed. See the description of `protocol.allow` in linkgit:git-config[1] for more details. `GIT_PROTOCOL_FROM_USER`:: -- gitgitgadget
