Merge branch 'master' into autotag

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

diff --git a/doc/plugins/mdwn/discussion.mdwn b/doc/plugins/mdwn/discussion.mdwn
index 9ebf99b7e0149eefc3f29423ba864719f0584628..4b05e7f4e8ea425f60454243b7526b9d54a37f9d 100644 (file)
--- a/doc/plugins/mdwn/discussion.mdwn
+++ b/doc/plugins/mdwn/discussion.mdwn
@@ -5,7 +5,3 @@ you need to overwrite the underlay
 dir (set underlaydir in ikiwiki.setup
 to your own underlay dir or replace underlay pages
 in your $SRC).
 dir (set underlaydir in ikiwiki.setup
 to your own underlay dir or replace underlay pages
 in your $SRC).

-
-Specially, the [[shortcut]] plugin is hardcoded to
-use shortcuts.mdwn.  So you need pay more care if
-you [[use shortcut without mdwn|shortcut/discussion]].