summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2013-10-09 13:18:17 +0200
committerJonas Smedegaard <dr@jones.dk>2013-10-09 13:18:17 +0200
commitc74257f775e2a57fc97fe2d7facb9b68fa667c5b (patch)
treec7e57c4336c1290e321eaaa2f763cd2a4548e629
parente12c1371b890390412db3ed7205254d1d6fadebc (diff)
parent180e3557b657da29f4106054a8abe2f029aec088 (diff)
Merge branch 'typos'
-rw-r--r--ikiwiki/formatting.mdwn2
-rw-r--r--ikiwiki/markdown.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/ikiwiki/formatting.mdwn b/ikiwiki/formatting.mdwn
index befbce9..d2a5f46 100644
--- a/ikiwiki/formatting.mdwn
+++ b/ikiwiki/formatting.mdwn
@@ -24,7 +24,7 @@ do) followed by a period:
To create a header, start a line with one or more `#` characters followed
by a space and the header text. The number of `#` characters controls the
-size of the header:
+level of the header:
# # h1
## ## h2
diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn
index 6841919..d1aa914 100644
--- a/ikiwiki/markdown.mdwn
+++ b/ikiwiki/markdown.mdwn
@@ -7,5 +7,5 @@ For documentation about the markdown syntax, see [[formatting]] and
[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
+of the markdown syntax, and are the only bits of markup that this wiki
handles internally.