Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 2a6feecf563d94b9b4b6fe3226f65072819eb4bf..deddfbd6d4c930b3a7978881215bbdd6c6fd00a0 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


@@ -124,8 +124,8 @@ ignores the git authorship information, and uses the username of the unix
 user who made the commit. Then tests including the `locked_pages` [[PageSpec]]
 are checked to see if that user can edit the pages in the commit.
 
 user who made the commit. Then tests including the `locked_pages` [[PageSpec]]
 are checked to see if that user can edit the pages in the commit.
 

-You can even set up an anonymous user, to allow anyone to push
-changes in via git rather than using the web interface.
+You can even set up an [[anonymous_user|tips/untrusted_git_push]], to allow
+anyone to push changes in via git rather than using the web interface.

 
 ## Optionally using a local wiki to preview changes
 
 
 ## Optionally using a local wiki to preview changes