From ac8af9e4bd564926b3aa3f031f57552f32454db9 Mon Sep 17 00:00:00 2001 From: Fredrik Luthander Date: Wed, 8 May 2013 01:06:25 +0200 Subject: Access control documentation: Clean up of categories Change I43b368705dc89c5092c0698fe283c7b1920fff30 broke out Review-Labels to its own page. Unfortunately the big Access Control headline was replaced with a single category. I restore the big headline and size down the Review-Labels category headline. Also, as the categories are sorted alphabetically, I move Review-Labels down to the right place and standardize the anchor name to be similar to other categories. Change-Id: Ib7ef625bd54936c947370d536c277b742e411059 Signed-off-by: Fredrik Luthander --- Documentation/access-control.txt | 30 +++++++++++++++++++----------- Documentation/config-labels.txt | 6 +++--- 2 files changed, 22 insertions(+), 14 deletions(-) (limited to 'Documentation') diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt index 398a9aeceb..44198e8e27 100644 --- a/Documentation/access-control.txt +++ b/Documentation/access-control.txt @@ -394,18 +394,12 @@ change page will have a 'Publish' button which allows you to convert individual draft patch sets of a change into public patch sets for review. -[[access_labels]] -Review Labels -------------- - -For every configured label `My-Name` in the project, there is a -corresponding permission `label-My-Name` with a range corresponding to -the defined values. +[[access_categories]] +Access Categories +----------------- -Gerrit comes pre-configured with several default labels that can be -granted to groups within projects, enabling functionality for that -group's members. link:config-labels.html[Custom labels] may also be -defined globally or on a per-project basis. +Gerrit has several permission categories that can be granted to groups +within projects, enabling functionality for that group's members. With the release of the Gerrit 2.2.x series, the web GUI for ACL configuration was rewritten from scratch. Use this @@ -739,6 +733,20 @@ Users without this access right can only remove themselves from the reviewer list on a change. +[[category_review_labels]] +Review Labels +~~~~~~~~~~~~~ + +For every configured label `My-Name` in the project, there is a +corresponding permission `label-My-Name` with a range corresponding to +the defined values. + +Gerrit comes pre-configured with a default 'Code-Review' label that can +be granted to groups within projects, enabling functionality for that +group's members. link:config-labels.html[Custom labels] may also be +defined globally or on a per-project basis. + + [[category_submit]] Submit ~~~~~~ diff --git a/Documentation/config-labels.txt b/Documentation/config-labels.txt index 4f84bf69b6..5014242ed4 100644 --- a/Documentation/config-labels.txt +++ b/Documentation/config-labels.txt @@ -4,9 +4,9 @@ Gerrit Code Review - Review Labels As part of the code review process, reviewers score each change with values for each label configured for the project. The label values that a given user is allowed to set are defined according to the -link:access-control.html#access_labels[access controls]. Gerrit comes -pre-configured with the Code-Review label that can be granted to groups -within projects, enabling functionality for that group's members. +link:access-control.html#category_review_labels[access controls]. Gerrit +comes pre-configured with the Code-Review label that can be granted to +groups within projects, enabling functionality for that group's members. [[label_Code-Review]] -- cgit v1.2.3