Merge remote branch 'upstream/master' into prv/po

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

diff --git a/doc/ikiwiki/markdown.mdwn b/doc/ikiwiki/markdown.mdwn
index 73aee9c1619409a331a67260a86ea9f1f8ab5495..68419192942abb3c25758e5d8b52f319bf8311f1 100644 (file)
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -1,12 +1,11 @@
+[[!meta robots="noindex, follow"]]
 [Markdown](http://daringfireball.net/projects/markdown/)
 is a minimal markup language that resembles plain text as used in
 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
-[markdown mode](http://jrblevin.freeshell.org/software/markdown-mode/) for 
-emacs can help in editing.
+[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
 
-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.