avoid ugly warning if size="" is specified

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

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 8f6561fcf3fff334dacbf928006bd8d75b8d75be..d7480ee8f6371f8863dbc000a1e84f84a4952a3a 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -22,20 +22,22 @@ 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.
 """]]
-[[!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="""
-## edit templates
+## default content for new pages
 
 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.
 """]]
 
+[[!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
@@ -71,7 +73,7 @@ html out of ikiwiki and in the templates.
 * `editpage.tmpl`, `editconflict.tmpl`, `editcreationconflict.tmpl`,
   `editfailedsave.tmpl`, `editpagegone.tmpl`, `pocreatepage.tmpl`,
   `editcomment.tmpl` `commentmoderation.tmpl`, `renamesummary.tmpl`,
-  `passwordmail.tmpl` - Parts of ikiwiki's user interface; do not
-  normally need to be customised.
+  `passwordmail.tmpl`, `openid-selector.tmpl` - Parts of ikiwiki's user
+  interface; do not normally need to be customised.
 
 [[!meta robots="noindex, follow"]]