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 5ddfab7ebf36e66b2a49934d4de90131625ff1f7..c61ae3dba08a668ba1d9f566610f2e311a14de71 100644 (file)
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -4,18 +4,17 @@ versions.
 
 It currently includes these pages:
 
 
 It currently includes these pages:
 

-* index (not the one in this wiki)
-* sandbox (not the on in this wiki)
-* [[blog]]
-* [[HelpOnFormatting]]
-* [[markdown]]
-* [[openid]]
-* [[pagespec]]
-* [[PreprocessorDirective]]
+* [[index]]
+* [[sandbox]]

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

 [[style.css]], and some icons.
 [[style.css]], and some icons.