diff --git a/doc/groupes.markdown b/doc/groupes.markdown
deleted file mode 100644
index e479ef5a9..000000000
--- a/doc/groupes.markdown
+++ /dev/null
@@ -1,3 +0,0 @@
-Groups Management
-=================
-
diff --git a/doc/groups.markdown b/doc/groups.markdown
new file mode 100644
index 000000000..0c79bddaa
--- /dev/null
+++ b/doc/groups.markdown
@@ -0,0 +1,17 @@
+Groups Management
+=================
+
+In Kanboard, each users can be member of one or many groups.
+A group is like a team or an organization.
+
+Only administrators can create new groups and assign users.
+
+Groups can be managed from **User management > View All Groups**.
+From there, you can create groups and assign users.
+
+![Group Management](screenshots/groups-management.png)
+
+Each project manager can authorize the access to a set of groups from the [project permissions page](project-permissions.markdown).
+
+The external id is mainly used for external group providers.
+Kanboard provide a LDAP group provider to [sync automatically groups from LDAP servers](ldap-group-sync.markdown).
diff --git a/doc/project-permissions.markdown b/doc/project-permissions.markdown
index 762ab3070..0a47835a4 100644
--- a/doc/project-permissions.markdown
+++ b/doc/project-permissions.markdown
@@ -1,49 +1,23 @@
-Project permissions
+Project Permissions
 ===================
 
-A project can have two kinds of people: **project managers** and **project members**.
+Each project is isolated and compartmented from each other.
+The project access must be allowed by the project owner.
 
-- Project managers can manage the configuration of the project and access to the reports.
-- Project members can only do basic operations (create or move tasks).
+Each user and each group can have a different role assigned.
+There are 3 types of [roles for projects](roles.markdown):
 
-When you create a new project, you are automatically assigned as a project manager.
+- Project Manager
+- Project Member
+- Project Viewer
 
-Kanboard administrators can access to everything but they are not necessary project members or managers. **Those permissions are defined at the project level**.
+Only administrators have access to everything.
 
-Permissions for each role
--------------------------
+Roles assignation is available from **Project Settings > Permissions**:
 
-### Project members
+![Project Permissions](screenshots/project-permissions.png)
 
-- Use the board (create, move and edit tasks)
-- Remove only tasks created by themselves
+If you choose to allow everybody, all Kanboard users will be considered Project Member.
+That also means there is no role management anymore. Permissions per user or per group cannot be applied.
 
-### Project managers
-
-- Use the board
-- Configure the project
-	- Share, rename, duplicate and disable the project
-	- Manage swimlanes, categories, columns and users
-	- Edit automatic actions
-- CSV Exports
-- Remove tasks of any project members
-- Access to the analytics section
-
-They **cannot remove the project**.
-
-Manage users and permissions
-----------------------------
-
-To define project roles, go to the **project configuration page** then click on **User management**.
-
-### User management
-
-![Project permissions](http://kanboard.net/screenshots/documentation/project-permissions.png)
-
-From there, you can choose to add new members, change the role or revoke user access.
-
-### Allow everybody
-
-If you choose to allow everybody (all Kanboard users), the project is considered public.
-
-That means there is no role management anymore. Permissions per user cannot be applied.
+Private projects cannot define permissions.
diff --git a/doc/screenshots/groups-management.png b/doc/screenshots/groups-management.png
new file mode 100644
index 000000000..475b68271
Binary files /dev/null and b/doc/screenshots/groups-management.png differ
diff --git a/doc/screenshots/project-permissions.png b/doc/screenshots/project-permissions.png
new file mode 100644
index 000000000..c44507556
Binary files /dev/null and b/doc/screenshots/project-permissions.png differ