Merge "For deleting a branch, the "Delete Reference" permission is sufficient." into stable-2.14

Documentation/access-control.txt

@@ -602,7 +602,7 @@ safest mode as commits cannot be discarded.
 
 * Force option
 +
-Allows an existing branch to be deleted. Since a force push is
+Implies <<category_delete,Delete Reference>>. Since a force push is
 effectively a delete immediately followed by a create, but performed
 atomically on the server and logged, this option also permits forced
 push updates to branches.  Enabling this option allows existing commits

Documentation/project-configuration.txt

@@ -272,13 +272,20 @@ There are several ways to delete a branch:
 - in the Web UI under 'Projects' > 'List' > <project> > 'Branches'
 - via the link:rest-api-projects.html#delete-branch[Delete Branch]
   REST endpoint
-- by using a git client to force push nothing to an existing branch
+- by using a git client
++
+----
+  $ git push origin --delete refs/heads/<branch-to-delete>
+----
++
+another method, by force pushing nothing to an existing branch:
 +
 ----
   $ git push --force origin :refs/heads/<branch-to-delete>
 ----
 
 To be able to delete branches, the user must have the
+link:access-control.html#category_delete[Delete Reference] or the
 link:access-control.html#category_push[Push] access right with the
 `force` option. In addition, project owners and Gerrit administrators
 can delete branches from the Web UI or via REST even without having the

gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java

@@ -201,7 +201,8 @@ public class ReceiveCommits {
     UPDATE(
         "You are not allowed to perform this operation.\n"
             + "To push into this reference you need 'Push' rights."),
-    DELETE("You need 'Push' rights with the 'Force Push'\nflag set to delete references."),
+    DELETE("You need 'Delete Reference' rights or 'Push' rights with the \n"
+            + "'Force Push' flag set to delete references."),
     DELETE_CHANGES("Cannot delete from '" + REFS_CHANGES + "'"),
     CODE_REVIEW(
         "You need 'Push' rights to upload code review requests.\n"