--- wikisrc/index.mdwn	2010/07/03 07:35:36	1.19
+++ wikisrc/index.mdwn	2013/11/30 16:33:54	1.51
@@ -1,28 +1,28 @@
 [[!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.
-
-[[!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"]]
-"""]]
+
+The NetBSD wiki is a place where NetBSD developers 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.
+
+See the [[Sitemap|wiki/sitemap]] for the complete contents, or use some of the top level topics below.
+
+Send patches/improvements/suggestions/critiques to [www@netbsd.org](mailto:www@netbsd.org), or to any NetBSD developer you happen to find.
+
+
+## Contents
+
+* [[Events|events]] -- NetBSD related events will be listed here
+* [[Summits]] -- Stories from past NetBSD Developer summits
+* [blog](http://blog.netbsd.org) -- Weblog
+* [[Tutorials]] -- Guides & Docs (some from the former user-wiki)
+* [[Features|features]] -- Features of the NetBSD Operating System
+* [[Projects]] -- The big list of work.  Get hacking!
+* [[pkgsrc]] -- pkgsrc docs - the NetBSD package manager
+* [[releng]] -- release engineering
+* [[Users]] -- developer sandbox pages
+* [[Community|community]] -- known community resources
+* [[amazon_ec2]] -- NetBSD on amazon's EC2
+* [[Ports]] -- NetBSD on your hardware