summaryrefslogtreecommitdiff
path: root/ikiwiki.mdwn
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-10-23 13:09:05 +0200
committerJonas Smedegaard <dr@jones.dk>2008-10-23 13:09:05 +0200
commit1af4bdc6272745e503fdd8cb5baabfadc8d200cb (patch)
treebce9eea9963829f02140a330c13803ea2cb6e196 /ikiwiki.mdwn
parentcad690077c56d3ed423ac53fa292ead802fcb491 (diff)
parentb1fadc6eacaacb4d892b495e15ff82e9ba36c638 (diff)
Merge branch 'master' into cleanclean
Diffstat (limited to 'ikiwiki.mdwn')
-rw-r--r--ikiwiki.mdwn5
1 files changed, 2 insertions, 3 deletions
diff --git a/ikiwiki.mdwn b/ikiwiki.mdwn
index 89337d0..e0a971d 100644
--- a/ikiwiki.mdwn
+++ b/ikiwiki.mdwn
@@ -7,11 +7,10 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
Some documentation on using ikiwiki:
* [[ikiwiki/formatting]]
-* [[ikiwiki/blog]]
+* [[ikiwiki/wikilink]]
+* [[ikiwiki/subpage]]
* [[ikiwiki/pagespec]]
* [[ikiwiki/directive]]
-* [[ikiwiki/wikilink]]
* [[ikiwiki/markdown]]
-* [[ikiwiki/subpage]]
* [[ikiwiki/openid]]
* [[ikiwiki/searching]]