diff options
| author | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2008-12-30 18:24:36 +0100 |
| commit | 21add7ffa87a5e622d18bdbb24c638c15bdb3800 (patch) | |
| tree | 6780aa6dbee71f18db64e44b012e789fc8197d4b /doc/rcs | |
| parent | 3190e5cea75a43d38f58b8a45fbc87d5527d18f0 (diff) | |
| parent | 3032909090711c86c5056987043eeff5a1f6aec2 (diff) | |
Merge commit 'upstream/master' into prv/po
Conflicts:
debian/control
debian/copyright
doc/ikiwiki/pagespec.mdwn
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/rcs')
| -rw-r--r-- | doc/rcs/git.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 6ba0da894..deddfbd6d 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -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. -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 |