]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - doc/basewiki.mdwn
Merge commit 'upstream/master' into pub/master
[git.ikiwiki.info.git] / doc / basewiki.mdwn
index fca8902eb57b73b1a2152435c714a324cb80f894..c61ae3dba08a668ba1d9f566610f2e311a14de71 100644 (file)
@@ -6,15 +6,15 @@ It currently includes these pages:
 
 * [[index]]
 * [[sandbox]]
-* [[blog]]
-* [[HelpOnFormatting]]
-* [[markdown]]
-* [[openid]]
-* [[pagespec]]
-* [[PreprocessorDirective]]
 * [[shortcuts]]
-* [[subpage]]
-* [[wikilink]]
+* [[templates]]
+* [[ikiwiki/formatting]]
+* [[ikiwiki/markdown]]
+* [[ikiwiki/openid]]
+* [[ikiwiki/pagespec]]
+* [[ikiwiki/directive]]
+* [[ikiwiki/subpage]]
+* [[ikiwiki/wikilink]]
 
 As well as a few other files, like [[favicon.ico]], [[local.css]],
 [[style.css]], and some icons.