Merge branch 'master' into pub/master

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

diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index 29f632375729735a650cda14599d5d1c6dd8dae9..c61ae3dba08a668ba1d9f566610f2e311a14de71 100644 (file)
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -8,12 +8,11 @@ It currently includes these pages:
 * [[sandbox]]
 * [[shortcuts]]
 * [[templates]]
 * [[sandbox]]
 * [[shortcuts]]
 * [[templates]]

-* [[ikiwiki/blog]]

 * [[ikiwiki/formatting]]
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/pagespec]]
 * [[ikiwiki/formatting]]
 * [[ikiwiki/markdown]]
 * [[ikiwiki/openid]]
 * [[ikiwiki/pagespec]]

-* [[ikiwiki/PreprocessorDirective]]
+* [[ikiwiki/directive]]

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