From 0172868da7dcf8fa6e231fa974c6d6ee0bc5e5e6 Mon Sep 17 00:00:00 2001 From: Chris Tilden Date: Wed, 24 Aug 2011 13:12:42 -0700 Subject: [PATCH] Fixes documentation typos --- doc/gitolite-and-ssh.mkd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/gitolite-and-ssh.mkd b/doc/gitolite-and-ssh.mkd index d4e07d0cf..9988ac016 100644 --- a/doc/gitolite-and-ssh.mkd +++ b/doc/gitolite-and-ssh.mkd @@ -135,7 +135,7 @@ When `gl-auth-command` gets control, it looks at the first argument `SSH_ORIGINAL_COMMAND` variable to find out which repository you want to access, and whether you're reading or writing. -Now is has user, repository, and access requested (read/write), gitolite looks +Now that it has a user, repository, and access requested (read/write), gitolite looks at its config file, and either allows or rejects the request. But this cannot differentiate between different branches within a repo; that @@ -155,7 +155,7 @@ happen -- see `git help hooks` for details. One of those hooks is the tag is about to be updated. The hook is passed the name of the branch or tag, the old SHA1 value, and the new SHA1 value, as arguments. Hooks that are called *before* an action happens are allowed to prevent that action from -happening y returning an error code. +happening by returning an error code. When gitolite is told to create a new repository (by the admin), it installs a special update hook. This hook takes all the information presented, looks