Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / wikitemplates.mdwn

diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 63735193bd1f3ca34f2eafda758d9e4ebddc7567..6c0480cea0630d2183efea5435d81204f8bd0cc1 100644 (file)
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -21,6 +21,7 @@ located in /usr/share/ikiwiki/templates by default.
 * `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.
 * `archivepage.tmpl` - Used for listing a page in a blog archive page.
 * `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.
 * `archivepage.tmpl` - Used for listing a page in a blog archive page.

+* `microblog.tmpl` - Used for showing a microblogging post inline.

 * `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
 * `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
 * `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create
 * `blogpost.tmpl` - Used for a form to add a post to a blog (and a rss/atom links)
 * `feedlink.tmpl` - Used to add rss/atom links if blogpost.tmpl is not used.
 * `aggregatepost.tmpl` - Used by the [[plugins/aggregate]] plugin to create


@@ -31,8 +32,12 @@ located in /usr/share/ikiwiki/templates by default.
   [[plugins/search]] plugin.
 * `comment.tmpl` - This template is used to display a comment
   by the [[plugins/comments]] plugin.
   [[plugins/search]] plugin.
 * `comment.tmpl` - This template is used to display a comment
   by the [[plugins/comments]] plugin.

-* `comments_form.tmpl` - This template is the comment post form for the
+* `editcomment.tmpl` - This template is the comment post form for the

   [[plugins/comments]] plugin.
   [[plugins/comments]] plugin.

+* `commentmoderation.tmpl` - This template is used to produce the comment
+  moderation form.
+* `recentchanges.tmpl` - This template is used for listing a change
+  on the RecentChanges page.

 
 The [[plugins/pagetemplate]] plugin can allow individual pages to use a
 different template than `page.tmpl`.
 
 The [[plugins/pagetemplate]] plugin can allow individual pages to use a
 different template than `page.tmpl`.