Merge "Fix link and improve consistency in 'Prohibited by Gerrit' error doc" into stable
diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt
index fdf40a0..8e93623 100644
--- a/Documentation/access-control.txt
+++ b/Documentation/access-control.txt
@@ -619,15 +619,15 @@
[[category_push_merge]]
-Upload Merge Commits
+Push Merge Commits
~~~~~~~~~~~~~~~~~~~~
-The `Push Merge` permits the user to upload merge commits. It's an
-addon to the `Push` permission, and so it won't be sufficient
-with only `Push Merge` granted for a push to happen. Some projects
-wish to restrict merges to being created by Gerrit. By granting
-`Push` without `Push Merge`, the only merges that enter the
-system will be those created by Gerrit.
+The `Push Merge Commit` permits the user to upload merge commits.
+It's an addon to the <<category_push,Push>> access right, and so it
+won't be sufficient with only `Push Merge Commit` granted for a push
+to happen. Some projects wish to restrict merges to being created by
+Gerrit. By granting `Push` without `Push Merge Commit`, the only
+merges that enter the system will be those created by Gerrit.
[[category_push_annotated]]
@@ -787,24 +787,26 @@
[options="header"]
|=================================================================================
|Gerrit 2.1.x |Gerrit 2.2.x
-|Code review |Label: Code review
-|Verify |Label: Verify
-|Forge Identity +1 |Forge author identity
-|Forge Identity +2 |Forge committer & author identity
-|Forge Identity +3 |Forge server & committer & author identity
-|Owner |Owner
-|Push branch +1 |Push
-|Push branch +2 |Create reference & Push
-|Push branch +3 |Push (with force) & Create reference
+|Code review |<<category_label-Code-Review,Label: Code review>>
+|Verify |<<category_label-Verified,Label: Verify>>
+|Forge Identity +1 |Forge <<category_forge_author,author>> identity
+|Forge Identity +2 |Forge <<category_forge_committer,committer>> & <<category_forge_author,author>> identity
+|Forge Identity +3 |Forge <<category_forge_server,server>> & <<category_forge_committer,committer>> & <<category_forge_author,author>> identity
+|Owner |<<category_owner,Owner>>
+|Push branch +1 |<<category_push_direct,Push>>
+|Push branch +2 |<<category_create,Create reference>> & <<category_push_direct,Push>>
+|Push branch +3 |<<category_push_direct,Push>> (with force) & <<category_create,Create reference>>
|Push tag +1 & Push Branch +2 |No support to limit to push signed tag
-|Push tag +2 & Push Branch +2 |Push annotated tag
-|Push tag +3 & Push Branch +2 |Create reference
-|Read +1 |Read
-|Read +2 |Read & Push branch (refs/for/refs/...)
-|Read +3 |Read & Push branch (refs/for/refs/...) & Push merge
-|Submit |Submit
+|Push tag +2 & Push Branch +2 |<<category_push_annotated,Push annotated tag>>
+|Push Branch +2 (refs/tags/*) |<<category_create,Create reference>> (refs/tags/...)
+|Push Branch +3 (refs/tags/*) |<<category_push_direct,Push>> (with force on refs/tags/...)
+|Read +1 |<<category_read,Read>>
+|Read +2 |<<category_read,Read>> & <<category_push_review,Push>> (refs/for/refs/...)
+|Read +3 |<<category_read,Read>> & <<category_push_review,Push>> (refs/for/refs/...) & <<category_push_merge,Push Merge Commit>>
+|Submit |<<category_submit,Submit>>
|=================================================================================
+
[NOTE]
In Gerrit 2.2.x, the way to set permissions for upload has changed entirely.
To upload a change for review is no longer a separate permission type,
diff --git a/Documentation/error-not-allowed-to-upload-merges.txt b/Documentation/error-not-allowed-to-upload-merges.txt
index 9aa144a..981ba91c 100644
--- a/Documentation/error-not-allowed-to-upload-merges.txt
+++ b/Documentation/error-not-allowed-to-upload-merges.txt
@@ -7,9 +7,8 @@
If you need to upload merge commits, you can contact one of the
project owners and request permissions to upload merge commits
-(access right link:access-control.html#category_push['Push'] and
-link:access-control.html#category_push_merge['Push merge']) for this
-project.
+(access right link:access-control.html#category_push_merge['Push Merge Commit'])
+for this project.
If one of your changes could not be merged in Gerrit due to conflicts
and you created the merge commit to resolve the conflicts, you might
