Merge remote branch 'upstream/master' into prv/po

[ikiwiki.git] / doc / ikiwiki / directive / edittemplate.mdwn

diff --git a/doc/ikiwiki/directive/edittemplate.mdwn b/doc/ikiwiki/directive/edittemplate.mdwn
index b3187ea66eb8e3590b44dbf9e5869a23275c6cc5..c486e821b0fc3ddd66d61226cb53f56ab18ad6bc 100644 (file)
--- a/doc/ikiwiki/directive/edittemplate.mdwn
+++ b/doc/ikiwiki/directive/edittemplate.mdwn
@@ -1,4 +1,4 @@
-The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate]] plugin.
+The `edittemplate` directive is supplied by the [[!iki plugins/edittemplate desc=edittemplate]] plugin.
 
 This directive allows registering template pages, that provide default
 content for new pages created using the web frontend. To register a
@@ -7,7 +7,9 @@ template, insert a [[ikiwiki/directive/template]] directive on some other page.
        \[[!edittemplate template="bugtemplate" match="bugs/*"]]
 
 In the above example, the page named "bugtemplate" is registered as a
-template to be used when any page named "bugs/*" is created.
+template to be used when any page named "bugs/*" is created. To avoid
+the directive displaying a note about the template being registered, add
+"silent=yes".
 
 Often the template page contains a simple skeleton for a particular type of
 page. For the bug report pages in the above example, it might look
@@ -19,7 +21,7 @@ something like:
        Details:
 
 The template page can also contain [[!cpan HTML::Template]] directives,
-similar to other ikiwiki [[templates]]. Currently only one variable is
+like other ikiwiki [[templates]]. Currently only one variable is
 set: `<TMPL_VAR name>` is replaced with the name of the page being
 created.