* Allow discussion links on pages to be turned off with --no-discussion.

3 files changed, 7 insertions, 3 deletions

diff --git a/doc/ikiwiki.setup b/doc/ikiwiki.setup
index 17d3be7d7..57278976e 100644
--- a/doc/ikiwiki.setup
+++ b/doc/ikiwiki.setup
@@ -48,6 +48,8 @@ use IkiWiki::Setup::Standard {
 	#anonok => 1,
 	# Generate rss feeds for pages?
 	rss => 1,
+	# Include discussion links on all pages?
+	discussion => 1,
 	# To change the enabled plugins, edit this list
 	#plugin => [qw{pagecount inline brokenlinks hyperestraier smiley
 	#              htmlscrubber}],
diff --git a/doc/todo/optimisations.mdwn b/doc/todo/optimisations.mdwn
index 4cf0907f5..924ff8ffa 100644
--- a/doc/todo/optimisations.mdwn
+++ b/doc/todo/optimisations.mdwn
@@ -9,8 +9,5 @@
 * Don't render blog archive pages unless a page is added/removed. Just
   changing a page doesn't affect the archives as they show only the title.
 
-* Look at breaking the relatively rarely used blogging stuff out of
-  Render.pm, into its own module.
-
 * Look at splitting up CGI.pm. But note that too much splitting can slow
   perl down.
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 3a46dade8..03f40a892 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -172,6 +172,11 @@ These options configure the wiki.
   Disables use of a plugin. For example "--disable-plugin htmlscrubber"
   to do away with html sanitization.
 
+* --discussion, --no-discussion
+
+  Enables or disables "Discussion" links from being added to the header of
+  every page. The links are enabled by default.
+
 * --verbose
 
   Be vebose about what is being done.