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 1c234e3b5c38c46b0d4045d41c13ead8669353db..eff0e15e93d5930821677833ce4de8619658fb44 100644 (file)
--- a/doc/templates.mdwn
+++ b/doc/templates.mdwn
@@ -9,8 +9,6 @@ wiki.
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 
 
 [[!if test="enabled(template) and enabled(inline)" then="""
 

-## Available templates
-

 These templates are available for inclusion onto other pages in this
 wiki:
 
 These templates are available for inclusion onto other pages in this
 wiki:
 


@@ -83,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]].