summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/access-control.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/access-control.txt b/Documentation/access-control.txt
index 558b78493f..100e47312f 100644
--- a/Documentation/access-control.txt
+++ b/Documentation/access-control.txt
@@ -56,7 +56,7 @@ Non-Interactive Users
~~~~~~~~~~~~~~~~~~~~~
This is an internal user group, members of this group are not expected
-to perform interactive operations on the Gerrit web frontend.
+to perform interactive operations on the Gerrit web front-end.
However, sometimes such a user may need a separate thread pool in
order to prevent it from grabbing threads from the interactive users.
@@ -607,7 +607,7 @@ Push Merge Commits
~~~~~~~~~~~~~~~~~~~~
The `Push Merge Commit` access right permits the user to upload merge
-commits. It's an addon to the <<category_push,Push>> access right, and
+commits. It's an add-on 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
@@ -887,7 +887,7 @@ Optional access rights to grant:
CI system
~~~~~~~~~
-A typical Continous Integration system should be able to download new changes
+A typical Continuous Integration system should be able to download new changes
to build and then leave a verdict somehow.
As an example, the popular
@@ -960,7 +960,7 @@ power in the form of being able to delete branches. Optionally these users
also have the power to configure access rights in gits assigned to them.
[WARNING]
-These users should be really knowledgable about git, for instance knowing why
+These users should be really knowledgeable about git, for instance knowing why
tags never should be removed from a server. This role is granted potentially
destructive access rights and cleaning up after such a mishap could be time
consuming!
@@ -1110,8 +1110,8 @@ category. In the "`All-Projects`" we define the following rules:
====
[access "refs/heads/stable*"]
- label-Release-Proces = block -1..+1 group Anonymous Users
- label-Release-Proces = -1..+1 group Release Engineers
+ label-Release-Process = block -1..+1 group Anonymous Users
+ label-Release-Process = -1..+1 group Release Engineers
====
@@ -1146,7 +1146,7 @@ Conversion table from 2.1.x series to 2.2.x series
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,
instead you grant ordinary push permissions to the actual
-recieving reference. In practice this means that you set push permissions
+receiving reference. In practice this means that you set push permissions
on `refs/for/refs/heads/<branch>` rather than permissions to upload changes
on `refs/heads/<branch>`.
@@ -1241,7 +1241,7 @@ Kill Task
Allow the operation of the link:cmd-kill.html[kill command over ssh]. The
kill command ends tasks that currently occupy the Gerrit server, usually
a replication task or a user initiated task such as an upload-pack or
-recieve-pack.
+receive-pack.
[[capability_priority]]