diff options
| author | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-07-11 10:46:18 +0200 |
| commit | c99d26030e6ddd7a21932e98e40a8df7d896886d (patch) | |
| tree | 26056e3e2a5c7c81ebe7baf243a0bb4ae765e76e /doc/examples | |
| parent | c9b1a4dd7d826b5e8e2d0a757ba5ecbba8d832b2 (diff) | |
| parent | 1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
IkiWiki/Plugin/po.pm
doc/plugins/po.mdwn
Diffstat (limited to 'doc/examples')
| -rw-r--r-- | doc/examples/blog/comments.mdwn | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn index f59b44390..e22b50a34 100644 --- a/doc/examples/blog/comments.mdwn +++ b/doc/examples/blog/comments.mdwn @@ -1,9 +1,10 @@ [[!sidebar content=""" [[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation description="comments pending moderation" show=-1]] -Comments in the moderation queue: +Comments in the [[!commentmoderation desc="moderation queue"]]: [[!pagecount pages="comment_pending(./posts/*)"]] """]] Recent comments on posts in the [[blog|index]]: -[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]] +[[!inline pages="./posts/*/Discussion or comment(./posts/*)" +template="comment"]] |