Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn
index 7c3b71f70ce5d9f135c3e8768ca69e4aa364a17b..a4190945f541b6a9d5b0f4236675c47f6877c7aa 100644 (file)
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -5,9 +5,9 @@ email messages. It is the markup language used by this wiki by default.
 
 For documentation about the markdown syntax, see [[formatting]] and
 [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A
 
 For documentation about the markdown syntax, see [[formatting]] and
 [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A

-[markdown mode](http://jrblevin.freeshell.org/software/markdown-mode/) for 
+[markdown mode](http://jblevins.org/projects/markdown-mode/) for 

 emacs can help in editing.
 
 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.