--- wikisrc/index.mdwn	2011/02/26 13:40:08	1.28
+++ wikisrc/index.mdwn	2016/06/22 00:55:53	1.55
@@ -4,17 +4,25 @@
 #### {i} [[Sitemap|wiki/sitemap]]
 """]]
 
-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]]
+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.
 
-## Contents
+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.
 
-[[Tutorials]] | [[Users]] | [[Projects]]
 
-[[!meta robots="noindex, nofollow"]]
+## 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 of the NetBSD Operating System
+* [[Projects]] -- The big list of work.  Get hacking!
+* [[pkgsrc]] -- pkgsrc docs - the NetBSD package manager
+* [[releng]] -- release engineering
+* [[security]] -- Security features and hardening
+* [[Users]] -- developer sandbox pages
+* [[Community|community]] -- known community resources
+* [[amazon_ec2]] -- NetBSD on amazon's EC2
+* [[Ports]] -- NetBSD on your hardware