Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / ikiwiki.mdwn

diff --git a/doc/ikiwiki.mdwn b/doc/ikiwiki.mdwn
index 79049420cdd1d7cfcc22d2c1d8697639c5fa77f7..4d840696c592771d8ce09db40118e79226d89214 100644 (file)
--- a/doc/ikiwiki.mdwn
+++ b/doc/ikiwiki.mdwn
@@ -7,10 +7,11 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]

+* [[ikiwiki/wikilink]]
+* [[ikiwiki/subpage]]

 * [[ikiwiki/pagespec]]
 * [[ikiwiki/directive]]
 * [[ikiwiki/pagespec]]
 * [[ikiwiki/directive]]

-* [[ikiwiki/wikilink]]

 * [[ikiwiki/markdown]]
 * [[ikiwiki/markdown]]

-* [[ikiwiki/subpage]]

 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]

+* [[templates]]