X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/154532b2786df30e5341d300ad6d131843aa446b..3b49868eb98e33204ca52ba944be4023f9f3f821:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 1cef4bd87..9468e7508 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -57,12 +57,6 @@ use IkiWiki::Setup::Standard {
 	# 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 => [
 		#{
@@ -110,7 +104,7 @@ use IkiWiki::Setup::Standard {
 	discussion => 1,
 	# To exclude files matching a regexp from processing. This adds to
 	# the default exclude list.
-	#exclude => qr/*\.wav/,
+	#exclude => qr/\.wav$/,
 	# To change the extension used for generated html files.
 	#htmlext => 'htm',
 	# Time format (for strftime)