Commit 04c32ff1 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'patch-17' into 'master'

Fix syntax error that breaks link to permissions document.

See merge request !11968
parents 6168d199 3ac9be17
## What is the Glossary ## 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. 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 ...@@ -10,7 +9,7 @@ User authentication by combination of 2 different steps during login. This allow
### Access Levels ### 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) ### Active Directory (AD)
......
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