Commit ede3bd24 authored by Mike Jang's avatar Mike Jang

Merge branch 'docs-sensitive-language' into 'master'

Fix the sensitive language table in styleguide

See merge request gitlab-org/gitlab!39480
parents 5962ebf6 1fcf6f48
...@@ -360,10 +360,10 @@ Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-d ...@@ -360,10 +360,10 @@ Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-d
Avoid terms that reflect negative cultural stereotypes and history. In most cases, you can replace terms such as `master` and `slave` with terms that are more precise and functional, such as `primary` and `secondary`. Avoid terms that reflect negative cultural stereotypes and history. In most cases, you can replace terms such as `master` and `slave` with terms that are more precise and functional, such as `primary` and `secondary`.
| Use | Avoid | | Use | Avoid |
|-----------------------|----------------------| |----------------------|-----------------------|
| Primary / secondary | Master / slave | | Primary / secondary | Master / slave |
| Blacklist / whitelist | Allowlist / denylist | | Allowlist / denylist | Blacklist / whitelist |
For more information see the following [Internet Draft specification](https://tools.ietf.org/html/draft-knodel-terminology-02). For more information see the following [Internet Draft specification](https://tools.ietf.org/html/draft-knodel-terminology-02).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment