--- wikisrc/index.mdwn	2013/05/26 17:21:41	1.43
+++ wikisrc/index.mdwn	2020/01/05 18:52:28	1.65
@@ -4,24 +4,26 @@
 #### {i} [[Sitemap|wiki/sitemap]]
 """]]
 
-# 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.
+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.
+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)
-* [[events]] -- NetBSD related events will be listed here
-* [[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
+* [[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
 * [[Ports]] -- NetBSD on your hardware