Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

[ikiwiki.git] / doc / wikitemplates.mdwn

diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn
index 5e2eb8a3769a392371f51b27dd4af1b65a34cfdd..1beed649b7c84f0488408a03151a95a157879cc5 100644 (file)
--- a/doc/wikitemplates.mdwn
+++ b/doc/wikitemplates.mdwn
@@ -17,9 +17,9 @@ located in /usr/share/ikiwiki/templates by default.
   changes to a page.
 * `passwordmail.tmpl` - Not a html template, this is used to
   generate the mail with the user's password in it.
-* `rsspage.tmpl` - Used for generating rss feeds for [[blog]]s.
+* `rsspage.tmpl` - Used for generating rss feeds for [blogs|[ikiwiki/blog]].
 * `rssitem.tmpl` - Used for generating individual items on rss feeds.
-* `atompage.tmpl` - Used for generating atom feeds for [[blog]]s.
+* `atompage.tmpl` - Used for generating atom feeds for blogs.
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
 * `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.
@@ -34,5 +34,8 @@ located in /usr/share/ikiwiki/templates by default.
 * `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search
   form to wiki pages.
 
+The [[plugins/pagetemplate]] plugin can allow individual pages to use a
+different template than `page.tmpl`.
+
 The [[plugins/template]] plugin also uses templates, though those
 [[templates]] are stored in the wiki.