more reorg

1 files changed, 8 insertions, 6 deletions

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 9b8b29d23..70efcd8eb 100644
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -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>`
 
-[[!if test="enabled(template)" then="""
+[[!if test="(enabled(template) or enabled(edittemplate)) then="""
 ## 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
-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="""
-## 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.
@@ -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="""
-## 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