summaryrefslogtreecommitdiff
path: root/templates.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2015-01-22 15:40:35 +0100
committerJonas Smedegaard <dr@jones.dk>2015-01-22 15:40:35 +0100
commitd2900fb6570a284cd6de6d4c0110cd89384de4af (patch)
treef1e61fcd5d96d6baf04f4d223d9044a308c7134a /templates.mdwn
parentc74257f775e2a57fc97fe2d7facb9b68fa667c5b (diff)
parentb09e27989b8786806ec12c9023ccdabc660f8901 (diff)
Merge branch 'ikiwiki'
Diffstat (limited to 'templates.mdwn')
-rw-r--r--templates.mdwn9
1 files changed, 7 insertions, 2 deletions
diff --git a/templates.mdwn b/templates.mdwn
index d0f891c..80372fc 100644
--- a/templates.mdwn
+++ b/templates.mdwn
@@ -14,8 +14,10 @@ easy to learn. All you really need to know to modify templates is this:
[[!if test="enabled(template) or enabled(edittemplate)" then="""
## template pages
-Template pages are regular wiki pages that are used as templates for other
-pages.
+Template pages are regular wiki pages containing a
+[[!iki ikiwiki/directive/templatebody desc="templatebody directive"]],
+used as templates for other pages. The parts of the template
+page outside the directive can be used to document it.
"""]]
[[!if test="enabled(template)" then="""
@@ -38,6 +40,9 @@ feeds=no archive=yes sort=title template=titlepage
rootpage=templates postformtext="Add a new template page named:"]]
"""]]
+If the template does not contain a `templatebody` directive, the entire
+source of the page is used for the template. This is deprecated.
+
## template files
Template files are unlike template pages in that they have the extension