Commit e9cfc62c authored by Nick Gaskill's avatar Nick Gaskill

Merge branch 'sselhorn-master-patch-17211' into 'master'

Added Alpha and Beta to word list

See merge request gitlab-org/gitlab!67898
parents 5a3b9cf3 4d86d1df
...@@ -35,6 +35,13 @@ Try to avoid, unless you are talking about security-related features. For exampl ...@@ -35,6 +35,13 @@ Try to avoid, unless you are talking about security-related features. For exampl
This phrasing is more active and is from the user perspective, rather than the person who implemented the feature. This phrasing is more active and is from the user perspective, rather than the person who implemented the feature.
[View details in the Microsoft style guide](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/a/allow-allows). [View details in the Microsoft style guide](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/a/allow-allows).
## Alpha
Uppercase. For example: **The XYZ feature is in Alpha.** or **This Alpha release is ready to test.**
You might also want to link to [this section](https://about.gitlab.com/handbook/product/gitlab-the-product/#alpha-beta-ga)
in the handbook when writing about Alpha features.
## and/or ## and/or
Instead of **and/or**, use or or rewrite the sentence to spell out both options. Instead of **and/or**, use or or rewrite the sentence to spell out both options.
...@@ -43,6 +50,13 @@ Instead of **and/or**, use or or rewrite the sentence to spell out both options. ...@@ -43,6 +50,13 @@ Instead of **and/or**, use or or rewrite the sentence to spell out both options.
Try to avoid extra words when referring to an example or table in a documentation page, but if required, use **following** instead. Try to avoid extra words when referring to an example or table in a documentation page, but if required, use **following** instead.
## Beta
Uppercase. For example: **The XYZ feature is in Beta.** or **This Beta release is ready to test.**
You might also want to link to [this section](https://about.gitlab.com/handbook/product/gitlab-the-product/#alpha-beta-ga)
in the handbook when writing about Beta features.
## blacklist ## blacklist
Do not use. Another option is **denylist**. ([Vale](../testing.md#vale) rule: [`InclusionCultural.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/InclusionCultural.yml)) Do not use. Another option is **denylist**. ([Vale](../testing.md#vale) rule: [`InclusionCultural.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/InclusionCultural.yml))
......
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