Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn
index 8d8cb55c21b482a6264774ae79eb782f13609b70..77d94d450528bb4bb7a2de1ea140c0cb62942d35 100644 (file)
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -1,5 +1,5 @@
-[[template id=plugin name=txt author="[[Gabriel]]"]]
-[[tag type/format]]
+[[!template id=plugin name=txt author="[[Gabriel]]"]]
+[[!tag type/format]]

 
 This plugin makes ikiwiki treat files with names ending in ".txt"
 as wiki pages.
 
 This plugin makes ikiwiki treat files with names ending in ".txt"
 as wiki pages.


@@ -9,6 +9,6 @@ txt files is done; the file contents is displayed to the user as-is,
 with html markup characters such as ">" escaped.
 
 The only exceptions are that [[WikiLinks|WikiLink]] and
 with html markup characters such as ">" escaped.
 
 The only exceptions are that [[WikiLinks|WikiLink]] and

-[[PreprocessorDirectives|PreprocessorDirective]] are still expanded by
-ikiwiki, and that, if the [[cpan URI::Find]] perl module is installed, URLs
+[[directives|ikiwiki/directive]] are still expanded by
+ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs

 in the txt file are converted to hyperlinks.
 in the txt file are converted to hyperlinks.