diff options
| author | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2009-06-06 14:03:40 +0200 |
| commit | 86edd73d169600875a10a635ef8df4a644545b0d (patch) | |
| tree | 1216eb826f2da7a1c11d84395f25468d1acfa69c /doc/plugins/txt.mdwn | |
| parent | 17b3d73f6e65d6a754633902b0dd4716d53b03a9 (diff) | |
| parent | e40d2a6b2b1bdf677f11cc4a71595acf609d1e75 (diff) | |
Merge commit 'upstream/master' into pub/po
Conflicts:
debian/changelog
debian/control
Signed-off-by: intrigeri <intrigeri@boum.org>
Diffstat (limited to 'doc/plugins/txt.mdwn')
| -rw-r--r-- | doc/plugins/txt.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/plugins/txt.mdwn b/doc/plugins/txt.mdwn index 77d94d450..420898d09 100644 --- a/doc/plugins/txt.mdwn +++ b/doc/plugins/txt.mdwn @@ -8,7 +8,7 @@ Unlike other [[type/format]] plugins, no formatting of markup in 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 +The only exceptions are that [[WikiLinks|ikiwiki/WikiLink]] and [[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. |