Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / rcs / git.mdwn

diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 2a6feecf563d94b9b4b6fe3226f65072819eb4bf..6ba0da8941741e42a46bbade4f39fe31e9601b33 100644 (file)
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -116,7 +116,7 @@ committers. Trusted committers, including the user that ikiwiki runs as,
 will not have their commits checked by the `pre-receive` hook. Untrusted
 committers will have their commits checked. The configuration settings to
 enable are `git_test_receive_wrapper`, which enables generation of a
 will not have their commits checked by the `pre-receive` hook. Untrusted
 committers will have their commits checked. The configuration settings to
 enable are `git_test_receive_wrapper`, which enables generation of a

-`pre-receive` hook, and `git_untrusted_committers`, which is a list of
+`pre-receive` hook, and `untrusted_committers`, which is a list of

 usernames of the untrusted committers.
 
 Note that when the `pre-receive` hook is checking incoming changes, it
 usernames of the untrusted committers.
 
 Note that when the `pre-receive` hook is checking incoming changes, it