Merge branch 'master' of git://git.ikiwiki.info

1 files changed, 11 insertions, 10 deletions

diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn
index 2155d7fea..b25601227 100644
--- a/doc/examples/blog.mdwn
+++ b/doc/examples/blog.mdwn
@@ -5,21 +5,22 @@ Or, run this command to set up a blog with ikiwiki.
 
 	% ikiwiki -setup /etc/ikiwiki/auto-blog.setup
 
-Some additional configuration you might want to do:
+Some additional configuration you might want to do, if not using
+`auto-blog.setup`:
 
 * Make sure to configure ikiwiki to generate RSS or Atom feeds.
 
-* Make sure you have the tag plugin enabled, and tag posts using it. An
-  example of how to tag a post is:
-	\[[!tag tags/life]]
-
-* Enable the [[sidebar|plugins/sidebar]] plugin to get a sidebar listing all
-  the categories you've tagged posts with.
+* Make sure you have the tag plugin enabled, and the `tagbase` set to
+  "tags". Tag pages will then automatically be created.
+  An example of how to tag a post is:
+	\[[!tag life]]
 
 * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud
   to display on the [[index]].
 
-* Enable the [[comments|plugins/comments]] plugin and configure it to
-  enable comments to posts to the blog:
+* Enable the [[comments|plugins/comments]] plugin to
+  enable comments to posts to the blog.
 
-  	comments_pagespec => 'blog/posts/* and !*/Discussion',
+* Enable the [[calendar|plugins/calendar]] plugin and run the
+  [[ikiwiki-calendar]] command from cron daily to get an interlinked
+  set of calendar archives.