--- wikisrc/index.mdwn	2010/07/03 07:35:36	1.19
+++ wikisrc/index.mdwn	2013/05/26 16:45:00	1.40
@@ -1,28 +1,38 @@
 [[!template id=note text="""
-#### (!) [[How to edit this wiki|wiki/start]]
+#### (?) [[How to edit|wiki/start]]
+#### {*} [[Wiki news|wiki/news]]
+#### {i} [[Sitemap|wiki/sitemap]]
 """]]
 
-If you're here because [wiki.netbsd.se](http://wiki.netbsd.se/) has
-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.
-
-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. We'll be ready for you soon.
+# The NetBSD developer wiki
+The NetBSD wiki is a place where NetBSD developers and users can write or host less formal content, experiment with converting the existing website into a new CMS, and get content published immediately about anything they happen to be doing.
 
-[[!meta robots="noindex, nofollow"]]
+See the [[Sitemap|wiki/sitemap]] for the complete contents, or use some of the top level topics below.
 
-[[!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"]]
-"""]]
+Send patches/improvements/suggestions/critiques to [www@netbsd.org](mailto:www@netbsd.org), or to any NetBSD developer you happen to find.
+
+
+## Contents
+
+[[/dev/null|dev/null]]  -- An experimental weblog used by [marketing@](mailto:marketing@netbsd.org)
+
+[[blog]] -- Weblog
+
+[[Tutorials]] -- Some quick-and-dirty guides & ports from the previous user wiki
+
+[[Projects]] -- The big list of work.  Get hacking!
+
+[[pkgsrc]] -- pkgsrc docs
+
+[[amazon_ec2]] -- NetBSD on amazon's EC2
+
+[[releng]] -- release engineering
+
+[[Users]] -- developer sandbox pages
+
+[[Community|community]] -- known community resources
+
+[[Ports]] -- NetBSD on your hardware
+
+
+[[!meta robots="noindex, nofollow"]]