diff options
| author | 🚄 Job van der Voort 🚀 <job@gitlab.com> | 2018-05-09 16:24:49 +0000 |
|---|---|---|
| committer | 🚄 Job van der Voort 🚀 <job@gitlab.com> | 2018-05-09 16:24:49 +0000 |
| commit | 96b9c070ad102ec1004921ff318e2a0a591a5a9c (patch) | |
| tree | f7ee9a781e4f1a57b975e44378466350ff6bcc9d | |
| parent | ade1db58e3b8638a91dcb5f35b888339fef4c185 (diff) | |
| parent | dec1b6dd0af0ee1ff94ec317f03de58b29d8b44c (diff) | |
| download | gitlab-ce-96b9c070ad102ec1004921ff318e2a0a591a5a9c.tar.gz | |
Merge branch 'docs/bdo-inclusive-language-groups-docs' into 'master'
Update documentation to use inclusive language, gender neutral name and pronoun.
See merge request gitlab-org/gitlab-ce!18858
| -rw-r--r-- | doc/user/group/index.md | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/user/group/index.md b/doc/user/group/index.md index 88f4bb2ee04..30761a66563 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -40,20 +40,20 @@ In GitLab, a namespace is a unique name to be used as a user name, a group name, - `http://gitlab.example.com/groupname` - `http://gitlab.example.com/groupname/subgroup_name` -For example, consider a user called John: +For example, consider a user named Alex: -1. John creates his account on GitLab.com with the username `john`; -his profile will be accessed under `https://gitlab.example.com/john` -1. John creates a group for his team with the groupname `john-team`; -his group and its projects will be accessed under `https://gitlab.example.com/john-team` -1. John creates a subgroup of `john-team` with the subgroup name `marketing`; -his subgroup and its projects will be accessed under `https://gitlab.example.com/john-team/marketing` +1. Alex creates an account on GitLab.com with the username `alex`; +their profile will be accessed under `https://gitlab.example.com/alex` +1. Alex creates a group for their team with the groupname `alex-team`; +the group and its projects will be accessed under `https://gitlab.example.com/alex-team` +1. Alex creates a subgroup of `alex-team` with the subgroup name `marketing`; +this subgroup and its projects will be accessed under `https://gitlab.example.com/alex-team/marketing` By doing so: -- Any team member mentions John with `@john` -- John mentions everyone from his team with `@john-team` -- John mentions only his marketing team with `@john-team/marketing` +- Any team member mentions Alex with `@alex` +- Alex mentions everyone from their team with `@alex-team` +- Alex mentions only the marketing team with `@alex-team/marketing` ## Issues and merge requests within a group |