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 e1f876acba097efc461353713136206217433784..c61ae3dba08a668ba1d9f566610f2e311a14de71 100644 (file)
--- a/doc/basewiki.mdwn
+++ b/doc/basewiki.mdwn
@@ -8,7 +8,6 @@ It currently includes these pages:
 * [[sandbox]]
 * [[shortcuts]]
 * [[templates]]
 * [[sandbox]]
 * [[shortcuts]]
 * [[templates]]

-* [[ikiwiki/blog]]

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