summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-09-11 13:58:08 +0300
committerLars Wirzenius <liw@liw.fi>2016-12-18 14:02:15 +0100
commitc377d3b4a30538c8c5419f56d75ceb95bc691ff4 (patch)
tree08ebb83b429ca99d2d381f8da52e2f82ec1fa02b
parent0fdb30e7107c6389555c84698e7196c4e1859787 (diff)
downloadgitano-c377d3b4a30538c8c5419f56d75ceb95bc691ff4.tar.gz
Further wording tweaks
-rw-r--r--doc/admin/000.mdwn14
1 files changed, 6 insertions, 8 deletions
diff --git a/doc/admin/000.mdwn b/doc/admin/000.mdwn
index 57a3559..8b7cb15 100644
--- a/doc/admin/000.mdwn
+++ b/doc/admin/000.mdwn
@@ -75,16 +75,14 @@ walkthrough later, after we first cover some of the Lace language.
## First example
-META: This section shows the "hello, world" example. It shows where
-the ruleset is kept, and how to edit and modify it. The example will
-be that everyone is allowed to create repos under a path that begins
-with their username.
+The first example is really simplistic. It contains a rule to allow a
+user to do anything to a repository prefixed by their username.
define repo_is_usernamed repository prefix ${user}/
allow "User's can create repos their username" repo_is_usernamed
Lace rules are used by Gitano whenever the user tries to do anything.
-Note that they only apply for access to the repositories via Giano
+Note that they only apply for access to the repositories via Gitano
(i.e., over the ssh protocol), and do not apply when access is via
other means (e.g., the git protocol itself). When they do apply,
however, they apply to everything: pulling, pushing, creating
@@ -108,13 +106,13 @@ allow/deny statements:
allow "Cats are cool" [user cat]
deny "Dogs drool too much" [user dog]
-What happens if user is neiter cat or dog? Neither condition will be
+What happens if user is neiter cat nor dog? Neither condition will be
true, and so access is neither allowed nor denied by the above ruleset
-snippet. Gitanou would continue evaluating further rules. If no rule
+snippet. Gitano would continue evaluating further rules. If no rule
triggers, Gitano uses the default, which is set with the the `default`
statement:
- default deny "The ruleset didn't provide access. Denying by default."
+ default deny "The ruleset didn't provide access. Denying by default."
If a default isn't set, the opposite of the last statement is used. If
the last statement is `allow`, but didn't trigger, the default is