diff options
| author | Anonymous <anonymous@none> | 2010-10-26 17:57:58 +0200 |
|---|---|---|
| committer | Anonymous <anonymous@none> | 2010-10-26 17:57:58 +0200 |
| commit | c2f01e320df8a27c0ac16fb38fba099925dbd010 (patch) | |
| tree | 8c104ecb3ff2b4f4c3b60832c2a3e46194beaa73 /doc/ikiwiki | |
| parent | 577e185b63c6703df1045a7109882e5c3548ab4d (diff) | |
| parent | 5c6eb167b8e69e0607330f06c893a73dfe1c675a (diff) | |
Merge remote branch 'remotes/origin/master'
Diffstat (limited to 'doc/ikiwiki')
| -rw-r--r-- | doc/ikiwiki/directive/template.mdwn | 10 | ||||
| -rw-r--r-- | doc/ikiwiki/pagespec.mdwn | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn index 6c50fa32e..9e3ae54df 100644 --- a/doc/ikiwiki/directive/template.mdwn +++ b/doc/ikiwiki/directive/template.mdwn @@ -34,11 +34,15 @@ large chunks of marked up text to be embedded into a template: The template is a regular wiki page, located in the `templates/` subdirectory inside the source directory of the wiki. -(Alternatively, templates can be stored in a directory outside the wiki, +Alternatively, templates can be stored in a directory outside the wiki, as files with the extension ".tmpl". -By default, these are searched for in `/usr/share/ikiwiki/templates`; +By default, these are searched for in `/usr/share/ikiwiki/templates`, the `templatedir` setting can be used to make another directory be searched -first.) +first. When referring to templates outside the wiki source directory, the "id" +parameter is not interpreted as a pagespec, and you must include the full filename +of the template page, including the ".tmpl" extension. E.g.: + + \[[!template id=blogpost.tmpl]] The template uses the syntax used by the [[!cpan HTML::Template]] perl module, which allows for some fairly complex things to be done. Consult its diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn index 6aec561ae..fe1af4c15 100644 --- a/doc/ikiwiki/pagespec.mdwn +++ b/doc/ikiwiki/pagespec.mdwn @@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions: tags matched by a glob) * "`backlink(page)`" - matches only pages that a given page links to * "`creation_month(month)`" - matches only files created on the given month + number * "`creation_day(mday)`" - or day of the month * "`creation_year(year)`" - or year * "`created_after(page)`" - matches only files created after the given page |