Commit c013d656 authored by Craig Norris's avatar Craig Norris

Merge branch 'selhorn-trademark-move' into 'master'

Moved possessive GitLab to terms list

See merge request gitlab-org/gitlab!63576
parents e04a2db1 5747a185
......@@ -306,13 +306,6 @@ GitLab documentation should be clear and easy to understand.
- Write in US English with US grammar. (Tested in [`British.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/British.yml).)
- Use [inclusive language](#inclusive-language).
### Trademark
Only use the GitLab name and trademarks in accordance with
[GitLab Brand Guidelines](https://about.gitlab.com/handbook/marketing/corporate-marketing/brand-activation/brand-guidelines/#trademark).
Don't use the possessive form of the word GitLab (`GitLab's`).
### Capitalization
#### Headings
......@@ -508,7 +501,7 @@ especially in tutorials, instructional documentation, and
Some contractions, however, should be avoided:
- Do not use [the word GitLab in a contraction](#trademark).
- Do not use the word "GitLab" in a contraction.
- Do not use contractions with a proper noun and a verb. For example:
......
......@@ -48,6 +48,10 @@ Do not use Latin abbreviations. Use **for example**, **such as**, **for instance
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))
## GitLab
Do not make possessive (GitLab's). This guidance follows [GitLab Brand Guidelines](https://about.gitlab.com/handbook/marketing/corporate-marketing/brand-activation/brand-guidelines/#trademark).
## handy
Do not use. If the user doesn't find the process to be these things, we lose their trust.
......
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