web commit by http://madduck.myopenid.com/: clarify denyNonFastForwards

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

diff --git a/doc/markdown.mdwn b/doc/markdown.mdwn
index 3684fe5c1cb9fd9d24a4f196b847c8e65438c10b..e7823bbf6b2c1e83edc2deecad61ffa33aa5da80 100644 (file)
--- a/doc/markdown.mdwn
+++ b/doc/markdown.mdwn
@@ -1,8 +1,13 @@
 [Markdown](http://daringfireball.net/projects/markdown/)
 is a minimal markup language that resembles plain text as used in
 [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.
+email messages. It is the markup language used by this wiki by default.

 
 For documentation about the markdown syntax, see [[HelpOnFormatting]] and
 
 For documentation about the markdown syntax, see [[HelpOnFormatting]] and

-[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
+[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax). A
+[markdown mode](http://jrblevin.freeshell.org/software/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 [[WikiLink]]s and [[PostProcessorDirective]]s are not part of the markdown syntax, and are the only bit of markup that this wiki handles internally.