diff --git a/conf/example.conf b/conf/example.conf index e6aac3b..de2ccf1 100644 --- a/conf/example.conf +++ b/conf/example.conf @@ -102,7 +102,7 @@ repo gitolite R = @staff RW+ = sitaram - # you can split up access rules for a repo as convenient + # you can split up access rules for a repo for convenience # (notice that @oss_repos contains gitolite also) repo @oss_repos R = @all diff --git a/doc/3-faq-tips-etc.mkd b/doc/3-faq-tips-etc.mkd index 684086a..ef92ca8 100644 --- a/doc/3-faq-tips-etc.mkd +++ b/doc/3-faq-tips-etc.mkd @@ -107,7 +107,7 @@ to replicate it manually. The input is your pubkey, typically /home/git/.ssh /home/git -[Actually, sshd requires that even directories *above* ~ (/, /home, +[Actually, `sshd` requires that even directories *above* `~` (`/`, `/home`, typically) also must be `go-w`, but that needs root. And typically they're already set that way anyway. (Or if they're not, you've got bigger problems than gitolite install not working!)] diff --git a/doc/4-wildcard-repositories.mkd b/doc/4-wildcard-repositories.mkd index aba4f66..a0fc1dc 100644 --- a/doc/4-wildcard-repositories.mkd +++ b/doc/4-wildcard-repositories.mkd @@ -159,7 +159,7 @@ use 'getperms' to check: The following points are important: - * note the syntax of the commands; it's not a "git" command,and there's no + * note the syntax of the commands; it's not a "git" command, and there's no `:` like in a repo URL. The first space-separated word is R or RW, and the rest are simple usernames. diff --git a/doc/6-ssh-troubleshooting.mkd b/doc/6-ssh-troubleshooting.mkd index 83d908b..976c6b6 100644 --- a/doc/6-ssh-troubleshooting.mkd +++ b/doc/6-ssh-troubleshooting.mkd @@ -22,7 +22,7 @@ gitolite *after* the install has completed successfully. In addition, I **strongly** recommend reading [this document][glb] -- it's a very detailed look at how gitolite uses ssh's features on the server side. -Most people don't know ssh as well as they *think* they do; even if you dont +Most people don't know ssh as well as they *think* they do; even if you don't have any problems right now, it's worth skimming over. In addition to both these documents, there's now a program called