Commit 1dce6b51 authored by Craig Norris's avatar Craig Norris

Merge branch 'selhorn-table-fix' into 'master'

Docs: Fixed broken tables

See merge request gitlab-org/gitlab!44211
parents 6b19d505 444c533c
...@@ -437,11 +437,13 @@ a gender-neutral pronoun. ...@@ -437,11 +437,13 @@ a gender-neutral pronoun.
Avoid the use of gender-specific pronouns, unless referring to a specific person. Avoid the use of gender-specific pronouns, unless referring to a specific person.
<!-- vale gitlab.InclusionGender = NO --> <!-- vale gitlab.InclusionGender = NO -->
| Use | Avoid | | Use | Avoid |
|-----------------------------------|---------------------------------| |-----------------------------------|---------------------------------|
| People, humanity | Mankind | | People, humanity | Mankind |
| GitLab Team Members | Manpower | | GitLab Team Members | Manpower |
| You can install; They can install | He can install; She can install | | You can install; They can install | He can install; She can install |
<!-- vale gitlab.InclusionGender = YES --> <!-- vale gitlab.InclusionGender = YES -->
If you need to set up [Fake user information](#fake-user-information), use If you need to set up [Fake user information](#fake-user-information), use
...@@ -452,6 +454,7 @@ diverse or non-gendered names with common surnames. ...@@ -452,6 +454,7 @@ diverse or non-gendered names with common surnames.
Avoid terms that are also used in negative stereotypes for different groups. Avoid terms that are also used in negative stereotypes for different groups.
<!-- vale gitlab.InclusionAbleism = NO --> <!-- vale gitlab.InclusionAbleism = NO -->
| Use | Avoid | | Use | Avoid |
|------------------------|----------------------| |------------------------|----------------------|
| Check for completeness | Sanity check | | Check for completeness | Sanity check |
...@@ -460,6 +463,7 @@ Avoid terms that are also used in negative stereotypes for different groups. ...@@ -460,6 +463,7 @@ Avoid terms that are also used in negative stereotypes for different groups.
| Placeholder variable | Dummy variable | | Placeholder variable | Dummy variable |
| Active/Inactive | Enabled/Disabled | | Active/Inactive | Enabled/Disabled |
| On/Off | Enabled/Disabled | | On/Off | Enabled/Disabled |
<!-- vale gitlab.InclusionAbleism = YES --> <!-- vale gitlab.InclusionAbleism = YES -->
Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-documentation#ableist-language) Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-documentation#ableist-language)
...@@ -472,10 +476,12 @@ cases, you can replace terms such as `master` and `slave` with terms that are ...@@ -472,10 +476,12 @@ cases, you can replace terms such as `master` and `slave` with terms that are
more precise and functional, such as `primary` and `secondary`. more precise and functional, such as `primary` and `secondary`.
<!-- vale gitlab.InclusionCultural = NO --> <!-- vale gitlab.InclusionCultural = NO -->
| Use | Avoid | | Use | Avoid |
|----------------------|-----------------------| |----------------------|-----------------------|
| Primary / secondary | Master / slave | | Primary / secondary | Master / slave |
| Allowlist / denylist | Blacklist / whitelist | | Allowlist / denylist | Blacklist / whitelist |
<!-- vale gitlab.InclusionCultural = YES --> <!-- vale gitlab.InclusionCultural = YES -->
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