summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-21 03:22:45 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-21 03:22:45 +0000
commit4fcf25a8200a25a850f095ac90b5ac9f4e395664 (patch)
tree4f829876a694743f3c816e834db340961ae658e1 /doc
parent50e1b43408e85fd2350b9df50e4ceb0c6a495a4f (diff)
remove the mtnbinpath config option; users should use PATH if they need
this kind of thing. change formatting of some quotes
Diffstat (limited to 'doc')
-rw-r--r--doc/ikiwiki.setup21
1 files changed, 11 insertions, 10 deletions
diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 864dc928f..897e8bc61 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -46,16 +46,17 @@ use IkiWiki::Setup::Standard {
# Monotone stuff
#rcs => "monotone",
#mtnkey => "web\@machine.company.com",
- # Monotone options
- #mtnsync => 0, # set this if you want the wiki to sync on update and commit
- #mtnrootdir => "path/to/root/of/workspace", # The path to your workspace (defaults to the srcdir itself)
- # e.g. use if your srcdir is a subdirectory of the workspace
- #mtnbinpath => "path/to/montone/binary", # by default we just use "mtn" and assume it is in your path.
- #mtnmergerc => "path/to/mergerc", # this is a monotone lua hook file used by ikiwiki for
- # inserting conflict markers. By default we use
- # mtnrootdir/_MTN/mergerc. This hook will be populated with
- # default code the first time you use ikiwiki. You can
- # change it to alter how conflict markers are inserted.
+ # Set if you want the wiki to sync on update and commit.
+ #mtnsync => 0,
+ # The path to your workspace (defaults to the srcdir itself)
+ # e.g. use if your srcdir is a subdirectory of the workspace.
+ #mtnrootdir => "path/to/root/of/workspace",
+ # This is a monotone lua hook file used by ikiwiki for
+ # inserting conflict markers. By default it will use
+ # mtnrootdir/_MTN/mergerc. This hook will be populated with
+ # default code the first time you use ikiwiki. You can
+ # change it to alter how conflict markers are inserted.
+ #mtnmergerc => "path/to/mergerc",
wrappers => [
#{