Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / plugins / html.mdwn

diff --git a/doc/plugins/html.mdwn b/doc/plugins/html.mdwn
index 5d300e5ff85f69219d908f506bac44008d5d2012..55e11bff09cd4d0f7180a09e1989c2f5eb80409f 100644 (file)
--- a/doc/plugins/html.mdwn
+++ b/doc/plugins/html.mdwn
@@ -1,11 +1,11 @@
-[[template id=plugin name=html included=1 author="""[[Joey]]"""]]
-[[tag type/html type/format]]
+[[!template id=plugin name=html author="[[Joey]]"]]
+[[!tag type/html type/format]]

 
 

-This plugin lets raw html pages be used as source pages for the wiki. The
+This plugin lets html pages be used as source pages for the wiki. The

 html pages will still be wrapped in the same html template as any other
 page, so for best results you should include only the page body in the html
 html pages will still be wrapped in the same html template as any other
 page, so for best results you should include only the page body in the html

-file. Also, if the htmlscrubber plugin is enabled, the html pages will be
-sanitised like any other page. You can also use standard [[WikiLink]]s etc
-in the html pages.
+file. Also, if the [[htmlscrubber]] plugin is enabled, the html pages will be
+sanitised like any other page. You can also use standard 
+[[WikiLinks|ikiwiki/WikiLink]] etc in the html pages.

 
 This plugin is included in ikiwiki, but is not enabled by default.
 
 This plugin is included in ikiwiki, but is not enabled by default.