summaryrefslogtreecommitdiff
path: root/ikiwiki/markdown.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-17 15:21:24 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-17 15:21:24 +0200
commit8a6868efccbba0c8f6fbb35e2f19c79d794221e5 (patch)
treebe35890e81c2ab9a5f333607f957204099d10fbf /ikiwiki/markdown.mdwn
parent262712e706420c9f421c7a4fc7a33ebe9bf1b1bf (diff)
parent6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 (diff)
Merge branch 'master' into scsscs
Diffstat (limited to 'ikiwiki/markdown.mdwn')
-rw-r--r--ikiwiki/markdown.mdwn4
1 files changed, 1 insertions, 3 deletions
diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn
index a419094..6841919 100644
--- a/ikiwiki/markdown.mdwn
+++ b/ikiwiki/markdown.mdwn
@@ -4,9 +4,7 @@ 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://jblevins.org/projects/markdown-mode/) for
-emacs can help in editing.
+[Markdown: syntax](http://daringfireball.net/projects/markdown/syntax).
Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part
of the markdown syntax, and are the only bit of markup that this wiki