Merge commit 'upstream/master' into pub/master

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

diff --git a/doc/basewiki.mdwn b/doc/basewiki.mdwn
index 912508c9e77f9ffbb520bf5cb6a8e5ff6181434b..c61ae3dba08a668ba1d9f566610f2e311a14de71 100644 (file)
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -6,17 +6,15 @@ It currently includes these pages:
 
 * [[index]]
 * [[sandbox]]
 
 * [[index]]
 * [[sandbox]]

-* [[blog]]
-* [[HelpOnFormatting]]
-* [[markdown]]
-* [[openid]]
-* [[pagespec]]
-* [[passwordauth]]
-* [[PreprocessorDirective]]

 * [[shortcuts]]
 * [[shortcuts]]

-* [[smileys]]
-* [[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.
 
 As well as a few other files, like [[favicon.ico]], [[local.css]],
 [[style.css]], and some icons.