Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/templates.mdwn b/doc/templates.mdwn
index 41542e22c08bd90f49b98dd406a184445377acb0..eff0e15e93d5930821677833ce4de8619658fb44 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -5,7 +5,7 @@ else="This wiki has templates **disabled**."
 ]]
 
 Templates are files that can be filled out and inserted into pages in the
 ]]
 
 Templates are files that can be filled out and inserted into pages in the

-wiki, using the [[ikiwiki/directive/template]] [[ikiwiki/directive]].
+wiki.

 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 


@@ -81,6 +81,7 @@ that contains it, so you can include WikiLinks and all other forms of wiki
 markup in the template. Note though that such WikiLinks will not show up as
 backlinks to the page that uses the template.
 
 markup in the template. Note though that such WikiLinks will not show up as
 backlinks to the page that uses the template.
 

-Note the use of "raw_name" inside the [[WikiLink]] generator. This ensures
-that if the name contains something that might be mistaken for wiki markup,
-it's not converted to html before being processed as a [[WikiLink]].
+Note the use of "raw_name" inside the [[ikiwiki/WikiLink]] generator. This
+ensures that if the name contains something that might be mistaken for wiki
+markup, it's not converted to html before being processed as a
+[[ikiwiki/WikiLink]].