web commit by http://melissensaft.myopenid.com/: How can I enable textile? Problem...

[ikiwiki.git] / doc / markdown.mdwn

diff --git a/doc/markdown.mdwn b/doc/markdown.mdwn
index 17cf808f0950358541fd22bfdebcb706ecbf2037..317a17db9aced10b5db3a5ffea684953a6e6b8bb 100644 (file)
--- a/doc/markdown.mdwn
+++ b/doc/markdown.mdwn
@@ -1,9 +1,10 @@
 [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 [[HelpOnEditing]] and
+For documentation about the markdown syntax, see [[HelpOnFormatting]] and
 [Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
 
-Note that [[WikiLink]]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 [[PreProcessorDirective]]s are not part of the
+markdown syntax, and are the only bit of markup that this wiki handles
+internally.