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 73aee9c1619409a331a67260a86ea9f1f8ab5495..3bebaef65e08553a5ecf7ccec42d93290cd1bbc8 100644 (file)
--- a/doc/ikiwiki/markdown.mdwn
+++ b/doc/ikiwiki/markdown.mdwn
@@ -1,12 +1,14 @@
+[[!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](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 mode](http://jblevins.org/projects/markdown-mode/) for 
+emacs can help in editing, as can this
+[syntax file](http://plasticboy.com/markdown-vim-mode/) for vim.

 
 

-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.