Merge branch 'docs/master-maintainer-note' into 'master'

Add note about Master/Maintainer role

See merge request gitlab-org/gitlab-ce!20028

doc/user/permissions.md

@@ -25,6 +25,9 @@ See our [product handbook on permissions](https://about.gitlab.com/handbook/prod
 
 ## Project members permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 The following table depicts the various user permission levels in a project.
 
 | Action                                | Guest   | Reporter   | Developer   |Maintainer| Owner  |
@@ -146,6 +149,9 @@ read through the documentation on [permissions and access to confidential issues
 
 ## Group members permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 Any user can remove themselves from a group, unless they are the last Owner of
 the group. The following table depicts the various user permission levels in a
 group.
@@ -223,6 +229,9 @@ which visibility level you select on project settings.
 
 ## GitLab CI/CD permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 GitLab CI/CD permissions rely on the role the user has in GitLab. There are four
 permission levels in total:
 
@@ -250,6 +259,9 @@ instance and project. In addition, all admins can use the admin interface under
 
 ### Job permissions
 
+NOTE: **Note:**
+In GitLab 11.0, the Master role was renamed to Maintainer.
+
 >**Note:**
 GitLab 8.12 has a completely redesigned job permissions system.
 Read all about the [new model and its implications][new-mod].
@@ -301,4 +313,4 @@ Read through the documentation on [LDAP users permissions](https://docs.gitlab.c
 [ce-18994]: https://gitlab.com/gitlab-org/gitlab-ce/issues/18994
 [new-mod]: project/new_ci_build_permissions_model.md
 [ee-998]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/998
-[eep]: https://about.gitlab.com/products/
\ No newline at end of file
+[eep]: https://about.gitlab.com/products/