Merge branch 'master' into cvs

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

diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 1873fb9ac2ce107d6c9a5e1d3a1f6dc9d89e21a5..e22b50a3474435222d6179b496162cff42e2afaa 100644 (file)
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,8 +1,10 @@
 [[!sidebar content="""
 [[!sidebar content="""

-[[!inline pages="comment_pending(/posts/*)" name=pendingmoderation show=-1]]
-Comments in the moderation queue:
-[[!pagecount pages="comment_pending(/posts/*)"]]
+[[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
+description="comments pending moderation" show=-1]]
+Comments in the [[!commentmoderation desc="moderation queue"]]:
+[[!pagecount pages="comment_pending(./posts/*)"]]

 """]]
 
 Recent comments on posts in the [[blog|index]]:
 """]]
 
 Recent comments on posts in the [[blog|index]]:

-[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"
+template="comment"]]