diff --git a/doc/.vale/gitlab/LatinTerms.yml b/doc/.vale/gitlab/LatinTerms.yml index 79ba4c17651e5a912c6d400a166de3c3003c89c4..12553a801a1ce4adc92e0bf061f449be1cdfcb16 100644 --- a/doc/.vale/gitlab/LatinTerms.yml +++ b/doc/.vale/gitlab/LatinTerms.yml @@ -15,5 +15,3 @@ swap: e\. g\.: for example i\.e\.: that is i\. e\.: that is - etc\.: and so on - et cetera: and so on diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md index 3fba9078babf129dfab56a3660984b197f301598..2a983e92791e99ef4d6f62e5b498add3dc6c220d 100644 --- a/doc/development/documentation/styleguide/word_list.md +++ b/doc/development/documentation/styleguide/word_list.md @@ -86,6 +86,13 @@ Do not use **e-mail** with a hyphen. When plural, use **emails** or **email mess See [the Microsoft style guide](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/e/enable-enables) for guidance. Use **active** or **on** instead. ([Vale](../testing.md#vale) rule: [`InclusionAbleism.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/InclusionAbleism.yml)) +## etc. + +Try to avoid. Be as specific as you can. Do not use **and so on** as a replacement. + +- Avoid: You can update objects, like merge requests, issues, etc. +- Use instead: You can update objects, like merge requests and issues. + ## future tense When possible, use present tense instead. For example, use `after you execute this command, GitLab displays the result` instead of `after you execute this command, GitLab will display the result`. ([Vale](../testing.md#vale) rule: [`FutureTense.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/FutureTense.yml))