further improvement

diff --git a/doc/ikiwiki/directive/inline.mdwn b/doc/ikiwiki/directive/inline.mdwn
index c6a23ce3c6e7c5c5f263b623bf8c440103ecf3ab..49b993d551a8ad488bd834374285b60b1a655eea 100644 (file)
--- a/doc/ikiwiki/directive/inline.mdwn
+++ b/doc/ikiwiki/directive/inline.mdwn
@@ -116,6 +116,3 @@ Here are some less often needed parameters:
   in conjunction with this one.
 
 [[!meta robots="noindex, follow"]]
   in conjunction with this one.
 
 [[!meta robots="noindex, follow"]]

-
-A related directive is the [[ikiwiki/directive/edittemplate]] directive, which allows
-default text for a new page to be specified.

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index ce0fd8ef8a49bc9d8cddc9d8a29dec31fd16dbd9..2eb1df49444edba7f4c705e51d9b31ca562c37eb 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -11,15 +11,6 @@ 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>`
 

-## template files
-
-Template files have the extension `.tmpl`.
-
-Templates are located in `/usr/share/ikiwiki/templates` by default;
-the `templatedir` setting can be used to make another directory be
-searched first. Customised templates can also be placed inside the
-"templates/" directory in your wiki's source.
-

 [[!if test="enabled(template)" then="""
 ## template pages
 
 [[!if test="enabled(template)" then="""
 ## template pages
 


@@ -42,16 +33,26 @@ and enabled(inline)" then="""
 
 [[!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

-rootpage=templates postformtext="Add a new template named:"]]
+rootpage=templates postformtext="Add a new template page named:"]]

 """]]
 
 """]]
 

-## wiki templates
+## template files
+
+Template files are unlike template pages in that they have the extension
+`.tmpl`. Template files are used extensively by Ikiwiki to generate html.
+They can contain html that would not normally be allowed on a wiki page.
+
+Template files are located in `/usr/share/ikiwiki/templates` by default;
+the `templatedir` setting can be used to make another directory be
+searched first. Customised template files can also be placed inside the
+"templates/" directory in your wiki's source -- files placed there override
+ones in the `templatedir`.

 
 

-These templates are used to build the wiki. The aim is to keep almost all
-html out of ikiwiki and in the templates.
+Here is a full list of the template files used:

 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the
 
 * `page.tmpl` - Used for displaying all regular wiki pages. This is the

-  key template to customise. [[!if test="enabled(pagetemplate)" then="""
+  key template to customise to change the look and feel of your site.
+  [[!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`.)"""]]
 * `rsspage.tmpl` - Used for generating rss feeds for blogs.
   (The [[!iki ikiwiki/directive/pagetemplate desc="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.