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 1b7e7821bb24d76c21f04c98447a653af4ba8b1d..77d94d450528bb4bb7a2de1ea140c0cb62942d35 100644 (file)
--- a/doc/plugins/txt.mdwn
+++ b/doc/plugins/txt.mdwn
@@ -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

-[[directives|directive]] are still expanded by
+[[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.
 ikiwiki, and that, if the [[!cpan URI::Find]] perl module is installed, URLs
 in the txt file are converted to hyperlinks.