diff --git a/content/manuals/enterprise/security/roles-and-permissions/_index.md b/content/manuals/enterprise/security/roles-and-permissions/_index.md index 9549ad764eb0..e3bc2db64b80 100644 --- a/content/manuals/enterprise/security/roles-and-permissions/_index.md +++ b/content/manuals/enterprise/security/roles-and-permissions/_index.md @@ -60,7 +60,7 @@ Use custom roles when: ## How roles work together -Users and teams can be assigned either a core role or a custom role, but not both. However, roles work in combination with team permissions: +You can assign users and teams either a core role or a custom role, but not both. However, roles work in combination with team permissions: 1. **Role permissions**: Applied organization-wide (core or custom role). Custom roles can grant permissions to both organization-wide settings and repository access. 2. **Team permissions**: Additional repository-specific permissions when users are added to teams. This is a separate permission system from role-based permissions. diff --git a/content/manuals/enterprise/security/roles-and-permissions/custom-roles.md b/content/manuals/enterprise/security/roles-and-permissions/custom-roles.md index 7d7f66dd3923..44ba3adfd86d 100644 --- a/content/manuals/enterprise/security/roles-and-permissions/custom-roles.md +++ b/content/manuals/enterprise/security/roles-and-permissions/custom-roles.md @@ -29,8 +29,8 @@ Before you can assign a custom role to users, you must create one in the Admin Console: 1. Sign in to [Docker Home](https://app.docker.com). -2. Select **Admin Console**, then **User management**. -3. Select **Roles**, then **Create role**. +2. Select **Admin Console**. +3. Under **User management**, select **Roles** > **Create role**. 4. Create a name and describe what the role is for: - Provide a **Label** - Enter a unique **Name** identifier (can't be changed later) @@ -47,8 +47,8 @@ With a custom role created, you can now [assign custom roles to users](#assign-c ## Edit a custom role 1. Sign in to [Docker Home](https://app.docker.com). -2. Select **Admin Console**, then **User management**. -3. Select **Roles**. +2. Select **Admin Console**. +3. Under **User management**, select **Roles**. 4. Find your custom role from the list, and select the **Actions menu**. 5. Select **Edit**. 6. You can edit the following custom role settings: @@ -101,8 +101,8 @@ The role column will update to the newly assigned role. To see which users and teams are assigned to roles: 1. Sign in to [Docker Home](https://app.docker.com). -2. Select **Admin Console**, then **User management**. -3. Select **Roles**. +2. Select **Admin Console**. +3. Under **User management**, select **Roles**. 4. In the roles list, view the **Users** and **Teams** columns to see assignment counts. 5. Select a specific role to view its permissions and assignments in detail. @@ -148,8 +148,8 @@ To see which users and teams are assigned to roles: Before deleting a custom role, you must reassign all users and teams to different roles. 1. Sign in to [Docker Home](https://app.docker.com). -2. Select **Admin Console**, then **User management**. -3. Select **Roles**. +2. Select **Admin Console**. +3. Under **User management**, select **Roles**. 4. Find your custom role from the list, and select the **Actions menu**. 5. If the role has assigned users or teams: - Navigate to the **Members** page and change the role for all users assigned to this custom role