public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-28 14:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

rewrite of odd passage. rearranged bullets

Browse Source
This commit is contained in:
Mark Bishop
2018-06-07 17:52:39 -07:00
parent 85604a02d4
commit 788612716c
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/rancher/v2.x/en/concepts/global-configuration/_index.md
+3 -8
View File
@@ -106,11 +106,11 @@ Assignment of global permissions to a user depends on their authentication sourc
#### Custom Global Permissions #### Custom Global Permissions
Rather than assigning users the default global permissions of `Administrator` or `Standard User`, you can assign them _custom permissions_. Custom permissions are sets of global permissions composed of individual _permissions_ that you select. Rather than assigning users the default global permissions of `Administrator` or `Standard User`, you can assign them a custom set of permissions.
_Permissions_ are individual access rights that you can assign to a custom global permissions. _Permissions_ are individual access rights that you can assign when selecting a custom permission for a user.
Custom permissions are convenient for providing users with narrow or specialized access to Rancher. See the [table](#global-permissions-reference) below for a list of individual permissions available. Using custom permissions is convenient for providing users with narrow or specialized access to Rancher. See the [table below](#global-permissions-reference) for a list of individual permissions available.
#### Global Permissions Reference #### Global Permissions Reference
@@ -134,14 +134,9 @@ The following table lists each custom global permission available and whether it
Cluster and project roles define user authorization inside a cluster or project. You can manage these roles from the **Global > Security > Roles** page. From this page you can: Cluster and project roles define user authorization inside a cluster or project. You can manage these roles from the **Global > Security > Roles** page. From this page you can:
<<<<<<< HEAD
- Lock/unlock roles so that they may not be used in any new role assignments (existing assignments will still be enforce).
- Create and manage new roles for use across all clusters and projects.
=======
- Create and manage new roles for use across all clusters and projects - Create and manage new roles for use across all clusters and projects
- [Lock/unlock roles](#locked-roles) so that they may not be used in any new role assignments (existing assignments will still be enforce) - [Lock/unlock roles](#locked-roles) so that they may not be used in any new role assignments (existing assignments will still be enforce)
>>>>>>> psp updates
#### Membership and Role Assignment #### Membership and Role Assignment