* Add "template" option to inline plugin to allow for use of customised

  templates.

3 files changed, 11 insertions, 3 deletions

diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index a607474df..5cb8383c1 100644
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -34,6 +34,11 @@ directive:
   full controls.
 * `quick` - Build archives in quick mode, without reading page contents for
   metadata. By default, this also turns off generation of any feeds.
+* `template` - Specifies the template to fill out to display each inlined
+  page. By default the `inlinepage` [[template|templates]] is used, while
+  the `archivepage` template is used for archives. Set this parameter to
+  use some other, custom template. Note that you should still set
+  `archive=yes` if your custom template does not include the page content.
 * `raw` - Rather than the default behavior of creating a [[blog]],
   if raw is set to "yes", the page will be included raw, without additional
   markup around it, as if it were a literal part of the source of the 
diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 05fdc4426..1f98334c9 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -4,7 +4,8 @@ to learn.
 
 The aim is to keep almost all html out of ikiwiki and in the templates.
 
-It ships with some basic templates which can be customised:
+It ships with some basic templates which can be customised. These are
+located in /usr/share/ikiwiki/templates by default.
 
 * `page.tmpl` - Used for displaying all regular wiki pages.
 * `misc.tmpl` - Generic template used for any page that doesn't
@@ -22,8 +23,7 @@ It ships with some basic templates which can be customised:
 * `atomitem.tmpl` - Used for generating individual items on atom feeds.
 * `inlinepage.tmpl` - Used for adding a page inline in a blog
   page.
-* `inlinepagetitle.tmpl` - Used for listing a page inline in a blog
-  archive page.
+* `archivepage.tmpl` - Used for listing a page in a blog archive page.
 * `estseek.conf` - Not a html template, this is actually a template for
   a config file for the [[HyperEstraier]] search engine. If you like you
   can read the [[HyperEstraier]] docs and configure it using this.
diff --git a/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn b/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn
index 9575fdb81..7d3438b2e 100644
--- a/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn
+++ b/doc/todo/Option_to_disable_date_footer_for_inlines.mdwn
@@ -14,3 +14,6 @@ instance. --[[JoshTriplett]]
 >> In a related note, I'd like an option to include the creation date on some non-inlined pages too. I suppose
 >> that's doable with some template hook in a plugin, and a command-line parameter pagespec (suffices for me),
 >> but I haven't got around to that yet. --[[tuomov]]
+
+Customised templates can now be specified with the `templates` parameter,
+so [[todo/done]] --[[Joey]]