--- wikisrc/index.mdwn	2010/03/31 21:54:44	1.14
+++ wikisrc/index.mdwn	2020/08/06 09:40:59	1.66
@@ -1,28 +1,30 @@
 [[!template id=note text="""
-#### (!) [[Quick start|wiki/start]]
+#### (?) [[How to edit|wiki/start]]
+#### {*} [[Wiki news|wiki/news]]
+#### {i} [[Sitemap|wiki/sitemap]]
 """]]
 
-Welcome to the NetBSD wiki!
+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.
 
-   /!\ Please note this wiki is still under heavy construction.  
-Content editing is currently restricted to NetBSD developers.  
-In the near future, it will also be opened to users.  
-In the meantime, please refer to [wiki.netbsd.se](http://wiki.netbsd.se/) for up to date content.
-
-When all the necessary [[wiki/todo]] items are completed, we'll make a public
-announcement.
-<!-- until then... -->
-[[!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"]]
-"""]]
+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 are listed here
+* [[Summits]] -- Stories from past NetBSD Developer summits
+* [Blog](//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]] -- Security features and hardening
+* [[Users]] -- Developer sandbox pages
+* [[Community|community]] -- Known community resources
+* [[GitHub|github]] -- NetBSD on GitHub
+* [[Amazon EC2|amazon_ec2]] -- NetBSD on amazon's EC2
+* [[Laptops|laptops]] -- Information about laptop hardware support
+* [[Ports]] -- NetBSD on your hardware