Merge branch 'master' into cvs

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

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 2eb1df49444edba7f4c705e51d9b31ca562c37eb..d189fa073468dce570508c2d5fefa2c6b5c0afb6 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -1,5 +1,5 @@
 [[Ikiwiki]] uses many templates for many purposes. By editing its templates,
 [[Ikiwiki]] uses many templates for many purposes. By editing its templates,

-you can fully customise this site.
+you can fully customise its appearance, and avoid duplicate content.

 
 Ikiwiki uses the HTML::Template module as its template engine. This
 supports things like conditionals and loops in templates and is pretty
 
 Ikiwiki uses the HTML::Template module as its template engine. This
 supports things like conditionals and loops in templates and is pretty


@@ -11,17 +11,19 @@ easy to learn. All you really need to know to modify templates is this:
 * To use one block of text if a variable is set and a second if it's not,
   use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 
 * To use one block of text if a variable is set and a second if it's not,
   use `<TMPL_IF variable>text<TMPL_ELSE>other text</TMPL_IF>`
 

-[[!if test="enabled(template)" then="""
+[[!if test="enabled(template) or enabled(edittemplate)" then="""

 ## template pages
 
 ## template pages
 

+Template pages are regular wiki pages that are used as templates for other
+pages.
+"""]]
+
+[[!if test="enabled(template)" then="""

 The [[!iki ikiwiki/directive/template desc="template directive"]] allows
 The [[!iki ikiwiki/directive/template desc="template directive"]] allows

-wiki pages to be used as templates, filled out and inserted into other
-pages in the wiki.
+template pages to be filled out and inserted into other pages in the wiki.

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

-## default content for new pages
-

 The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
 be used to make new pages default to containing text from a template
 page, which can be filled out as the page is edited.
 The [[!iki ikiwiki/directive/edittemplate desc="edittemplate directive"]] can
 be used to make new pages default to containing text from a template
 page, which can be filled out as the page is edited.


@@ -29,7 +31,7 @@ page, which can be filled out as the page is edited.
 
 [[!if test="(enabled(template) or enabled(edittemplate))
 and enabled(inline)" then="""
 
 [[!if test="(enabled(template) or enabled(edittemplate))
 and enabled(inline)" then="""

-## available template pages
+These template pages are currently available:

 
 [[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
 feeds=no archive=yes sort=title template=titlepage
 
 [[!inline pages="templates/* and !*.tmpl and !templates/*/* and !*/discussion"
 feeds=no archive=yes sort=title template=titlepage


@@ -51,7 +53,7 @@ ones in the `templatedir`.
 Here is a full list of the template files used:
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
 Here is a full list of the template files used:
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the

-  key template to customise to change the look and feel of your site.
+  key template to customise to change the look and feel of Ikiwiki.

   [[!if test="enabled(pagetemplate)" then="""
   (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
   can be used to make a page use a different template than `page.tmpl`.)"""]]
   [[!if test="enabled(pagetemplate)" then="""
   (The [[!iki ikiwiki/directive/pagetemplate desc="pagetemplate directive"]]
   can be used to make a page use a different template than `page.tmpl`.)"""]]