summaryrefslogtreecommitdiff
path: root/doc/user/project
diff options
context:
space:
mode:
authorMark Chao <mchao@gitlab.com>2018-05-25 14:18:42 +0800
committerMark Chao <mchao@gitlab.com>2018-06-06 21:01:44 +0900
commit15469fe0a1625449d4bb27208b444e3c72afaaa0 (patch)
tree3fee4baebf632633547f11a809940775f470e6b3 /doc/user/project
parent8c24e78b999263b177e40d363699b4dd60c16782 (diff)
downloadgitlab-ce-15469fe0a1625449d4bb27208b444e3c72afaaa0.tar.gz
doc
Diffstat (limited to 'doc/user/project')
-rw-r--r--doc/user/project/deploy_tokens/index.md2
-rw-r--r--doc/user/project/members/index.md4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index c09d5aeba8e..0b9b49f326f 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -5,7 +5,7 @@
Deploy tokens allow to download (through `git clone`), or read the container registry images of a project without the need of having a user and a password.
Please note, that the expiration of deploy tokens happens on the date you define,
-at midnight UTC and that they can be only managed by [masters](https://docs.gitlab.com/ee/user/permissions.html).
+at midnight UTC and that they can be only managed by [maintainers](https://docs.gitlab.com/ee/user/permissions.html).
## Creating a Deploy Token
diff --git a/doc/user/project/members/index.md b/doc/user/project/members/index.md
index b5915bc1687..2c2e8e2d556 100644
--- a/doc/user/project/members/index.md
+++ b/doc/user/project/members/index.md
@@ -4,7 +4,7 @@ You can manage the groups and users and their access levels in all of your
projects. You can also personalize the access level you give each user,
per-project.
-You should have `master` or `owner` [permissions](../../permissions.md) to add
+You should have Maintainer or Owner [permissions](../../permissions.md) to add
or import a new user to your project.
To view, edit, add, and remove project's members, go to your
@@ -99,7 +99,7 @@ side of your screen.
---
-Project owners & masters will be notified of your request and will be able to approve or
+Project owners & maintainers will be notified of your request and will be able to approve or
decline it on the members page.
![Manage access requests](img/access_requests_management.png)