summaryrefslogtreecommitdiff
path: root/ikiwiki/formatting.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/formatting.mdwn
parent262712e706420c9f421c7a4fc7a33ebe9bf1b1bf (diff)
parent6b53960c5bbcf6a43f2e48b0b37a94e1f909b522 (diff)
Merge branch 'master' into scsscs
Diffstat (limited to 'ikiwiki/formatting.mdwn')
-rw-r--r--ikiwiki/formatting.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index 2ed5cc2..befbce9 100644
--- a/ikiwiki/formatting.mdwn
+++ b/ikiwiki/formatting.mdwn
@@ -7,7 +7,7 @@ called [[MarkDown]], and it works like this:
Leave blank lines between paragraphs.
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
+You can *\*emphasise\** or **\*\*strongly emphasise\*\*** text by placing it
in single or double asterisks.
To create a list, start each line with an asterisk: