--- wikisrc/index.mdwn	2009/11/10 13:51:40	1.4
+++ wikisrc/index.mdwn	2013/05/26 16:44:02	1.39
@@ -1,24 +1,38 @@
 [[!template id=note text="""
-#### Getting started:
+#### (?) [[How to edit|wiki/start]]
+#### {*} [[Wiki news|wiki/news]]
+#### {i} [[Sitemap|wiki/sitemap]]
+"""]]
 
-7. Edit via [[wiki/cvs]] or [[wiki/web]].
-7. Play in the [[SandBox]] (or read [[FormattingHelp|ikiwiki/formatting]]).
-7. Create yourself a [[users]] page.
-7. Write whatever you like, wherever you like.
+# 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.
 
---[[schmonz]]
-"""]]
+See the [[Sitemap|wiki/sitemap]] for the complete contents, or use some of the top level topics below.
 
-Welcome to the NetBSD wiki! Only NetBSD developers can
-edit. Anyone can read; when there's enough useful content we'll
-make a public announcement.
-
-#### [[!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]]  -- 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
 
-[[!inline pages="!* or !/*" feeds=no rootpage=/ postform=yes postformtext="Add a new page titled:"]] 
 
-<!-- until we're ready for public consumption -->
 [[!meta robots="noindex, nofollow"]]