X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/eff0e7aa8a8e0768b14e6bb45c6c6f1ec75b4ab7..cbe4f9ead531af1d6506d2661d0e61c94f860a71:/doc/ikiwiki.setup

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 9c94bcbe1..039ebb127 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 => [
 		#{
@@ -97,9 +91,9 @@ use IkiWiki::Setup::Standard {
 		#},
 	],
 
-	# Default to generating rss feeds for blogs?
+	# Default to generating rss feeds for pages with feeds?
 	#rss => 1,
-	# Default to generating atom feeds for blogs?
+	# Default to generating atom feeds for pages with feeds?
 	#atom => 1,
 	# Allow generating feeds even if not generated by default?
 	#allowrss => 1,
@@ -135,6 +129,9 @@ use IkiWiki::Setup::Standard {
 	#recentchangesnum => 100,
 	# Use new '!'-prefixed preprocessor directive syntax
 	#prefix_directives => 0,
+	# Attempt to make hardlinks to source files instead of copying them.
+	# Useful if the wiki contains large media files.
+	#hardlink => 1,
 
 	# To add plugins, list them here.
 	#add_plugins => [qw{goodstuff search wikitext camelcase