--- wikisrc/index.mdwn	2010/06/21 00:13:43	1.18
+++ wikisrc/index.mdwn	2011/02/26 13:40:08	1.28
@@ -1,30 +1,20 @@
 [[!template id=note text="""
-#### (!) [[How to edit this wiki|wiki/start]]
+#### (?) [[How to edit|wiki/start]]
+#### {*} [[Wiki news|wiki/news]]
+#### {i} [[Sitemap|wiki/sitemap]]
 """]]
 
-Welcome to the official NetBSD wiki!
+This will be the official wiki of The NetBSD Project. You can count
+on its long-term stability. We'd love to have your help building
+it, and we'll be ready for you soon.
+
+I estimate that [[two solid weekends of my time|wiki/todo]] should
+be enough to push it out the door and make a public announcement.
+In the meantime, if you have commit access, you can start editing
+this wiki right now. See instructions at right. --[[schmonz]]
 
-If you're here because [wiki.netbsd.se](http://wiki.netbsd.se/) is
-about to shut down, welcome. Took us by surprise, too; we'd hoped
-for a smooth transition rather than an arbitrary deadline. Alas,
-it's not in the cards. We ask for your patience as we work our way
-down [[the wiki todo list|wiki/todo]] as best we can.
+## Contents
 
-As an official service of The NetBSD Project, you can count on the
-long-term stability of this wiki. We'd love to have your help
-building it. Please bear with us until we're ready for you.
+[[Tutorials]] | [[Users]] | [[Projects]]
 
 [[!meta robots="noindex, nofollow"]]
-
-[[!inline
-pages="empty and pagespec"
-feeds=no
-rootpage="/"
-postform=yes
-postformtext="Add a new page entitled:"
-]]
-
-#### [[!toggle id="sitemap" text="Wiki sitemap"]]
-[[!toggleable id="sitemap" text="""
-[[!map pages="* and !recentchanges and !*popup* and !popup/* and !*.ico and !*.js and !*.css and !*.png and !*.gif"]]
-"""]]