diff options
| author | Joey Hess <joey@kitenet.net> | 2010-06-12 22:43:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-06-12 22:43:34 -0400 |
| commit | dccd76487151acc6adc93ec79f1808096bc41324 (patch) | |
| tree | 2bd59c215be163a1730ca46a866e24f1cb511837 /doc | |
| parent | c225cdad2524a12b998e550b6c0ba7079d164cff (diff) | |
edittemplate: Look for template pages under templates/ like everything else (still looks in old location for backwards compatability).
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/plugins/edittemplate.mdwn | 4 | ||||
| -rw-r--r-- | doc/templates.mdwn | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn index 85dfdfc2d..c19ecd858 100644 --- a/doc/plugins/edittemplate.mdwn +++ b/doc/plugins/edittemplate.mdwn @@ -2,5 +2,5 @@ [[!tag type/web]] This plugin provides the [[ikiwiki/directive/edittemplate]] [[ikiwiki/directive]]. -This directive allows registering template pages, that provide default -content for new pages created using the web frontend. +This directive allows registering [[template|templates]] pages, that +provide default content for new pages created using the web frontend. diff --git a/doc/templates.mdwn b/doc/templates.mdwn index 22b9345ef..d7480ee8f 100644 --- 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 |