diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-09 19:02:56 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-09 19:02:56 +0300 |
| commit | 04c32ff1bf444f5597286a5219f751c20b810967 (patch) | |
| tree | 1dc91ea05d0ef386c20c2403cf52d5eca8aeb985 | |
| parent | 6168d199350965a881794877087c0ac980baf695 (diff) | |
| parent | 3ac9be17248b33b8993e7a65a78e206867245557 (diff) | |
Merge branch 'patch-17' into 'master'
Fix syntax error that breaks link to permissions document.
See merge request !11968
| -rw-r--r-- | doc/university/glossary/README.md | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/university/glossary/README.md b/doc/university/glossary/README.md index 591d1524061..9544de41b9a 100644 --- a/doc/university/glossary/README.md +++ b/doc/university/glossary/README.md @@ -1,4 +1,3 @@ - ## What is the Glossary This contains a simplified list and definitions of some of the terms that you will encounter in your day to day activities when working with GitLab. @@ -10,7 +9,7 @@ User authentication by combination of 2 different steps during login. This allow ### Access Levels -Process of selective restriction to create, view, modify or delete a resource based on a set of assigned permissions. See [GitLab's Permission Guidelines](../../permissions/permissions.md +Process of selective restriction to create, view, modify or delete a resource based on a set of assigned permissions. See [GitLab's Permission Guidelines](../../user/permissions.md) ### Active Directory (AD) |