]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - doc/ikiwiki.mdwn
Merge commit 'upstream/master' into pub/master
[git.ikiwiki.info.git] / doc / ikiwiki.mdwn
index c98a97e5940f0d4bec153b095d7fa1e85fcfb44f..e0a971d96b631cc48a39b39f6dc9d27fee52bc6e 100644 (file)
@@ -7,11 +7,10 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/).
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]
 Some documentation on using ikiwiki:
 
 * [[ikiwiki/formatting]]
-* [[ikiwiki/blog]]
-* [[ikiwiki/pagespec]]
-* [[ikiwiki/PreprocessorDirective]]
 * [[ikiwiki/wikilink]]
 * [[ikiwiki/wikilink]]
-* [[ikiwiki/markdown]]
 * [[ikiwiki/subpage]]
 * [[ikiwiki/subpage]]
+* [[ikiwiki/pagespec]]
+* [[ikiwiki/directive]]
+* [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/searching]]