Merge "Update documentation to clarify how to set Global Capabilities" into stable-2.6

This commit is contained in:
Shawn Pearce 2013-04-24 16:24:30 +00:00 committed by Gerrit Code Review
commit f007cfd1f2
2 changed files with 7 additions and 4 deletions

View File

@ -1021,11 +1021,11 @@ on `refs/for/refs/heads/<branch>` rather than permissions to upload changes
on `refs/heads/<branch>`.
[[system_capabilities]]
System capabilities
[[global_capabilities]]
Global Capabilities
-------------------
The system capabilities control actions that the administrators of
The global capabilities control actions that the administrators of
the server can perform which usually affect the entire
server in some way. The administrators may delegate these
capabilities to trusted groups of users.
@ -1036,6 +1036,9 @@ administrative control of the server. This makes it possible to
keep fewer users in the administrators group, even while spreading
much of the server administration burden out to more users.
Global capabilities are assigned to groups in the access rights settings
of the root project ("`All-Projects`").
Below you find a list of capabilities available:

View File

@ -112,7 +112,7 @@ if options are set which cannot be used together.
calling user has no sufficient permissions.
E.g. some REST endpoints require that the calling user has certain
link:access-control.html#system_capabilities[global capabilities]
link:access-control.html#global_capabilities[global capabilities]
assigned.
`403 Forbidden` is also used if `self` is used as account ID and the