Merge branch 'ready/templatebody'

diff --cc IkiWiki.pm
Simple merge

diff --cc doc/ikiwiki/directive/edittemplate.mdwn
index 6269f5dd8a23935f1970fe62b998ecc15f569885,b3177daa806af4b7bf2e37d12ee795bff97d2239..70bd2ad258c78c2a2655544323e127fa9a09d459
--- 1/doc/ikiwiki/directive/edittemplate.mdwn
--- 2/doc/ikiwiki/directive/edittemplate.mdwn
+++ b/doc/ikiwiki/directive/edittemplate.mdwn
@@@ -25,22 -26,17 +26,29 @@@ the above example, it might look someth
        Version: 
        Reproducible: y/n
        Details:
+       ENDBODY]]
  
  The template page can also contain [[!cpan HTML::Template]] directives,
 -like other ikiwiki [[templates]]. Currently only one variable is
 -set: `<TMPL_VAR name>` is replaced with the name of the page being
 -created.
 +like other ikiwiki [[templates]].
 +
 +These variables might be set:
 +
 +* `<TMPL_VAR name>` is replaced with the name of the page being
 +  created.
 +  
 +* `<TMPL_VAR uuid>` is replaced with a version 4 (random) UUID
 +  suitable for use in `\[[!meta guid="urn:uuid:<TMPL_VAR uuid>"]]`.
 +  (Requires the `UUID::Tiny` Perl module if not running on Linux.)
 +
 +* `<TMPL_VAR time>` is replaced with the current (template generation)
 +  time using a fixed format (RFC 3339, `%Y-%m-%dT%H:%M:%SZ`),
 +  suitable for use in `\[[!meta date="<TMPL_VAR time>"]]`
 +  (see [[meta]]) or `\[[!date "<TMPL_VAR time>"]]` (see [[date]]).
  
+ Text outside the [[templatebody]] directive is not part of the template,
+ and can be used to document it.
+ 
+ If the template does not contain a [[templatebody]] directive, the entire
+ source of the page is used for the template. This is deprecated.
+ 
  [[!meta robots="noindex, follow"]]