summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki.pm9
-rw-r--r--debian/changelog1
-rw-r--r--doc/rcs/git.mdwn4
3 files changed, 11 insertions, 3 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 17e2a2a85..2ad2f792d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -277,13 +277,20 @@ sub getsetup () { #{{{
},
umask => {
type => "integer",
- description => "",
example => "022",
description => "force ikiwiki to use a particular umask",
advanced => 1,
safe => 0, # paranoia
rebuild => 0,
},
+ wrappergroup => {
+ type => "string",
+ example => "ikiwiki",
+ description => "group for wrappers to run in",
+ advanced => 1,
+ safe => 0, # paranoia
+ rebuild => 0,
+ },
libdir => {
type => "string",
default => "",
diff --git a/debian/changelog b/debian/changelog
index 6650baa5b..39bca7a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (2.71) UNRELEASED; urgency=low
produced by aggregate and recentchanges.
* French translation update from Philippe Batailler. Closes: #506250
* Spanish translation update from Victor Moral.
+ * Fix handling of wrappergroup option.
-- Joey Hess <joeyh@debian.org> Mon, 17 Nov 2008 14:02:10 -0500
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