wording

[git.ikiwiki.info.git] / doc / templates.mdwn

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 22b9345ef7faec93829dedd8725c437c964334f1..861d0bcbe1e60cff9aea5f420244b4c136af4a78 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -3,7 +3,7 @@ you can fully customise this site.
 
 Templates are located in `/usr/share/ikiwiki/templates` by default;
 the `templatedir` setting can be used to make another directory be
 
 Templates are located in `/usr/share/ikiwiki/templates` by default;
 the `templatedir` setting can be used to make another directory be

-searched first. Customized templates can also be placed inside the
+searched first. Customised templates can also be placed inside the

 "templates/" directory in your wiki's source.
 
 Ikiwiki uses the HTML::Template module as its template engine. This
 "templates/" directory in your wiki's source.
 
 Ikiwiki uses the HTML::Template module as its template engine. This


@@ -22,27 +22,29 @@ easy to learn. All you really need to know to modify templates is this:
 The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
 """]]
 The template directive allows wiki pages to be used as templates,
 filled out and inserted into other pages in the wiki.
 """]]

-[[!if test="enabled(template) and enabled(inline)" then="""
-[[!inline pages="templates/* and !*.tmpl and !*/discussion"
-feeds=no archive=yes sort=title template=titlepage
-rootpage=templates postformtext="Add a new template named:"]]
-"""]]

 
 [[!if test="enabled(edittemplate)" then="""
 
 [[!if test="enabled(edittemplate)" then="""

-## edit templates
+## default content for new pages

 
 The edittemplate directive can be used to make new pages default to
 
 The edittemplate directive can be used to make new pages default to

-containing text from a template, which can be filled as out the page is
+containing text from a template page, which can be filled as out the page is

 edited.
 """]]
 
 edited.
 """]]
 

+[[!if test="(enabled(template) or enabled(edittemplate))
+and enabled(inline)" then="""
+[[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
+feeds=no archive=yes sort=title template=titlepage
+rootpage=templates postformtext="Add a new template named:"]]
+"""]]
+

 ## wiki templates
 
 These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
 ## wiki templates
 
 These templates are used to build the wiki. The aim is to keep almost all
 html out of ikiwiki and in the templates.
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the

-  key template to customize. [[!if test="enabled(pagetemplate)" then="""
+  key template to customise. [[!if test="enabled(pagetemplate)" then="""

   (The pagetemplate directive can be used to make a page use a
   different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
   (The pagetemplate directive can be used to make a page use a
   different template than `page.tmpl`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.