Merge branch 'master' into cvs

[git.ikiwiki.info.git] / doc / examples / blog / index.mdwn

diff --git a/doc/examples/blog/index.mdwn b/doc/examples/blog/index.mdwn
index b273ba1a9b3d4740b4531f157f8b2f0ffe10b6f5..7914cd203a43eb6b48665a2d225327c5ade01d2c 100644 (file)
--- a/doc/examples/blog/index.mdwn
+++ b/doc/examples/blog/index.mdwn
@@ -1,17 +1,11 @@
-[[!template id=note text="""
-
-* [[Tags]]: [[!pagestats style="list" pages="./tags/*" among="./posts/*"]]
-* [[Recent_Comments|comments]]
-* [[Archives]]
-
-[[!if test="enabled(calendar)" then="""
-[[!calendar pages="./posts/* and !*/Discussion"]]
-
+[[!if test="enabled(sidebar)" then="""
+[[!sidebar]]
+""" else="""
+[[!inline pages=sidebar raw=yes]]
 """]]
 
-[[!inline pages="./posts/* and !*/Discussion" show="10"
+[[!inline pages="page(./posts/*) and !*/Discussion" show="10"
 actions=yes rootpage="posts"]]
 
-----
 
 This blog is powered by [ikiwiki](http://ikiwiki.info).