Merge commit 'upstream/master'

[git.ikiwiki.info.git] / doc / ikiwiki / markdown.mdwn

diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn
index bbda9add70a07f5862ef0aba66bd8088e8f807e3..a4190945f541b6a9d5b0f4236675c47f6877c7aa 100644 (file)
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -8,6 +8,6 @@ For documentation about the markdown syntax, see [[formatting]] and
 [markdown mode](http://jblevins.org/projects/markdown-mode/) for 
 emacs can help in editing.
 
-Note that [[WikiLink]]s and [[PreProcessorDirective]]s are not part of the
-markdown syntax, and are the only bit of markup that this wiki handles
-internally.
+Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
+of the markdown syntax, and are the only bit of markup that this wiki
+handles internally.