Recent changes to this wiki:

Remove myself
Index: wikisrc/summits/eurobsdcon_2018.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2018.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/summits/eurobsdcon_2018.mdwn	21 Jul 2018 00:16:20 -0000	1.5
+++ wikisrc/summits/eurobsdcon_2018.mdwn	21 Jul 2018 12:13:12 -0000	1.6
@@ -11,7 +11,6 @@
 
 [[!table data="""
 First Last | `login@` | comment(s)
-Martin Husemann | `martin@` |
 Alistair G. Crooks | `agc@` |
 Jörg Sonnenberger | `joerg@` |
 Pierre Pronchery | `khorben@` |
@@ -22,7 +21,6 @@
 
 [[!table data="""
 Speaker  | Title | Slides
-`martin@` | Release Engineering Changes | yes
  | |
 """]]
 

Add myself
Index: wikisrc/summits/eurobsdcon_2018.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2018.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/summits/eurobsdcon_2018.mdwn	20 Jul 2018 20:40:45 -0000	1.4
+++ wikisrc/summits/eurobsdcon_2018.mdwn	21 Jul 2018 00:16:20 -0000	1.5
@@ -14,6 +14,7 @@
 Martin Husemann | `martin@` |
 Alistair G. Crooks | `agc@` |
 Jörg Sonnenberger | `joerg@` |
+Pierre Pronchery | `khorben@` |
  | |
 """]]
 

Index: wikisrc/summits/eurobsdcon_2018.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2018.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/summits/eurobsdcon_2018.mdwn	20 Jul 2018 17:51:19 -0000	1.3
+++ wikisrc/summits/eurobsdcon_2018.mdwn	20 Jul 2018 20:40:45 -0000	1.4
@@ -13,6 +13,7 @@
 First Last | `login@` | comment(s)
 Martin Husemann | `martin@` |
 Alistair G. Crooks | `agc@` |
+Jörg Sonnenberger | `joerg@` |
  | |
 """]]
 

add agc
Index: wikisrc/summits/eurobsdcon_2018.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2018.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/summits/eurobsdcon_2018.mdwn	19 Jul 2018 10:59:02 -0000	1.2
+++ wikisrc/summits/eurobsdcon_2018.mdwn	20 Jul 2018 17:51:19 -0000	1.3
@@ -12,6 +12,7 @@
 [[!table data="""
 First Last | `login@` | comment(s)
 Martin Husemann | `martin@` |
+Alistair G. Crooks | `agc@` |
  | |
 """]]
 

Add a potential presentation/discussion
Index: wikisrc/summits/eurobsdcon_2018.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2018.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/summits/eurobsdcon_2018.mdwn	19 Jul 2018 10:55:07 -0000	1.1
+++ wikisrc/summits/eurobsdcon_2018.mdwn	19 Jul 2018 10:59:02 -0000	1.2
@@ -19,6 +19,8 @@
 
 [[!table data="""
 Speaker  | Title | Slides
+`martin@` | Release Engineering Changes | yes
+ | |
 """]]
 
 ## Discussions

Add EuroBSDCon 2018 summit
--- /dev/null	2018-07-19 10:55:04.000000000 +0000
+++ wikisrc/summits/eurobsdcon_2018.mdwn	2018-07-19 10:55:24.000000000 +0000
@@ -0,0 +1,26 @@
+[[!meta title="EuroBSDCon 2018 NetBSD Summit"]]
+
+## Details
+
+There will be a NetBSD developer summit, suggested
+date is the day before [EuroBSDCon](https://2018.eurobsdcon.org/) in Bucharest this year:
+
+Friday, 2018-09-21, time and place to be announced.
+
+## Planning to attend?
+
+[[!table data="""
+First Last | `login@` | comment(s)
+Martin Husemann | `martin@` |
+ | |
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker  | Title | Slides
+"""]]
+
+## Discussions
+
+## Varia

more FTP references
Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wikisrc/templates/port.mdwn	19 Jul 2018 10:20:53 -0000	1.19
+++ wikisrc/templates/port.mdwn	19 Jul 2018 10:25:28 -0000	1.20
@@ -8,13 +8,13 @@
 
 ## Release Info
 <TMPL_IF cur_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var1>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> download")
-<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> FTP")</TMPL_IF>
-<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var3>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> FTP")</TMPL_IF>
-<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var4>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> FTP")</TMPL_IF>
-<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var5>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> FTP")</TMPL_IF>
-<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var6>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> FTP")</TMPL_IF>
-<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var7>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> FTP")</TMPL_IF>
-<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> FTP")</TMPL_IF></TMPL_IF>
+<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> download")</TMPL_IF>
+<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var3>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> download")</TMPL_IF>
+<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var4>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> download")</TMPL_IF>
+<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var5>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> download")</TMPL_IF>
+<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var6>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> download")</TMPL_IF>
+<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var7>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> download")</TMPL_IF>
+<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> download")</TMPL_IF></TMPL_IF>
 <TMPL_UNLESS no_install_notes><TMPL_IF cur_rel><TMPL_IF port_var1><TMPL_IF port_var_install_notes>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port_var_install_notes>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF>
 <TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF></TMPL_IF></TMPL_UNLESS>
 <TMPL_IF pkg_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var1>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> pkgsrc binary packages")

Use more generic 'download' instead of (no longer true) 'ftp'
Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/templates/port.mdwn	19 Jul 2018 10:17:52 -0000	1.18
+++ wikisrc/templates/port.mdwn	19 Jul 2018 10:20:53 -0000	1.19
@@ -7,14 +7,14 @@
 <TMPL_VAR about>
 
 ## Release Info
-<TMPL_IF cur_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var1>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> FTP")
-<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> FTP")</TMPL_IF>
-<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var3>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> FTP")</TMPL_IF>
-<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var4>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> FTP")</TMPL_IF>
-<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var5>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> FTP")</TMPL_IF>
-<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var6>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> FTP")</TMPL_IF>
-<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var7>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> FTP")</TMPL_IF>
-<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> FTP")</TMPL_IF></TMPL_IF>
+<TMPL_IF cur_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var1>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> download")
+<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> FTP")</TMPL_IF>
+<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var3>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> FTP")</TMPL_IF>
+<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var4>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> FTP")</TMPL_IF>
+<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var5>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> FTP")</TMPL_IF>
+<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var6>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> FTP")</TMPL_IF>
+<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var7>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> FTP")</TMPL_IF>
+<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via download](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> FTP")</TMPL_IF></TMPL_IF>
 <TMPL_UNLESS no_install_notes><TMPL_IF cur_rel><TMPL_IF port_var1><TMPL_IF port_var_install_notes>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port_var_install_notes>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF>
 <TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF></TMPL_IF></TMPL_UNLESS>
 <TMPL_IF pkg_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var1>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> pkgsrc binary packages")

Use https and CDN instead of ftp
Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/templates/port.mdwn	13 Jan 2017 10:06:34 -0000	1.17
+++ wikisrc/templates/port.mdwn	19 Jul 2018 10:17:52 -0000	1.18
@@ -7,24 +7,24 @@
 <TMPL_VAR about>
 
 ## Release Info
-<TMPL_IF cur_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var1>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> FTP")
-<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> FTP")</TMPL_IF>
-<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var3>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> FTP")</TMPL_IF>
-<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var4>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> FTP")</TMPL_IF>
-<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var5>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> FTP")</TMPL_IF>
-<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var6>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> FTP")</TMPL_IF>
-<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var7>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> FTP")</TMPL_IF>
-<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> FTP")</TMPL_IF></TMPL_IF>
-<TMPL_UNLESS no_install_notes><TMPL_IF cur_rel><TMPL_IF port_var1><TMPL_IF port_var_install_notes>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port_var_install_notes>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF>
-<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF></TMPL_IF></TMPL_UNLESS>
-<TMPL_IF pkg_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var1>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> pkgsrc binary packages")
-<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var2>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> pkgsrc binary packages")</TMPL_IF>
-<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var3>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> pkgsrc binary packages")</TMPL_IF>
-<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var4>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> pkgsrc binary packages")</TMPL_IF>
-<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var5>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> pkgsrc binary packages")</TMPL_IF>
-<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var6>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> pkgsrc binary packages")</TMPL_IF>
-<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var7>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> pkgsrc binary packages")</TMPL_IF>
-<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port> pkgsrc binary packages")</TMPL_IF></TMPL_IF>
+<TMPL_IF cur_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var1>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> FTP")
+<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> FTP")</TMPL_IF>
+<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var3>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> FTP")</TMPL_IF>
+<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var4>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> FTP")</TMPL_IF>
+<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var5>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> FTP")</TMPL_IF>
+<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var6>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> FTP")</TMPL_IF>
+<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var7>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> FTP")</TMPL_IF>
+<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via FTP](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> FTP")</TMPL_IF></TMPL_IF>
+<TMPL_UNLESS no_install_notes><TMPL_IF cur_rel><TMPL_IF port_var1><TMPL_IF port_var_install_notes>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port_var_install_notes>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF>
+<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF></TMPL_IF></TMPL_UNLESS>
+<TMPL_IF pkg_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var1>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> pkgsrc binary packages")
+<TMPL_IF port_var2>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var2>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> pkgsrc binary packages")</TMPL_IF>
+<TMPL_IF port_var3>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var3>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> pkgsrc binary packages")</TMPL_IF>
+<TMPL_IF port_var4>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var4>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> pkgsrc binary packages")</TMPL_IF>
+<TMPL_IF port_var5>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var5>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> pkgsrc binary packages")</TMPL_IF>
+<TMPL_IF port_var6>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var6>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> pkgsrc binary packages")</TMPL_IF>
+<TMPL_IF port_var7>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var7>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> pkgsrc binary packages")</TMPL_IF>
+<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](https://cdn.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port> pkgsrc binary packages")</TMPL_IF></TMPL_IF>
 <TMPL_IF changes_cur>* [NetBSD/<TMPL_VAR port> <TMPL_VAR changes_cur> changes](http://www.NetBSD.org/changes/changes-<TMPL_VAR changes_cur>.html#port-<TMPL_VAR port> "NetBSD/<TMPL_VAR port> <TMPL_VAR changes_cur> changes")</TMPL_IF>
 * [NetBSD/<TMPL_VAR port> <TMPL_VAR changes_future> changes](http://www.NetBSD.org/changes/changes-<TMPL_VAR changes_future>.html#port-<TMPL_VAR port> "NetBSD/<TMPL_VAR port> <TMPL_VAR changes_future> changes")
 

Update for 8.0
Index: wikisrc/ports/acorn26.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn26.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/ports/acorn26.mdwn	19 Mar 2018 04:46:32 -0000	1.14
+++ wikisrc/ports/acorn26.mdwn	19 Jul 2018 10:15:05 -0000	1.15
@@ -1,10 +1,10 @@
 [[!template id=port
 port="acorn26"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"
 pkg_rel="6.1"
-changes_cur="7.0"
-changes_future="8.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/arm26/arch310.gif"
 about="""
 NetBSD/acorn26 is the port of NetBSD to ARMv2 and ARMv2a machines, primarily the
Index: wikisrc/ports/acorn32.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn32.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/ports/acorn32.mdwn	19 Mar 2018 04:46:32 -0000	1.17
+++ wikisrc/ports/acorn32.mdwn	19 Jul 2018 10:15:05 -0000	1.18
@@ -1,10 +1,10 @@
 [[!template id=port
 port="acorn32"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"
 pkg_rel="6.1"
-changes_cur="7.0"
-changes_future="8.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/acorn32/riscpc.gif"
 about="""
 NetBSD/acorn32 is a port to ARM- and StrongARM-powered Acorn RiscPC compatible
Index: wikisrc/ports/algor.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/algor.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/ports/algor.mdwn	19 Mar 2018 04:46:32 -0000	1.16
+++ wikisrc/ports/algor.mdwn	19 Jul 2018 10:15:05 -0000	1.17
@@ -1,10 +1,10 @@
 [[!template id=port
 port="algor"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"
 pkg_rel="6.0"
-changes_cur="7.0"
-changes_future="8.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/algor/alogo2.gif"
 no_install_notes="defined"
 about="""
Index: wikisrc/ports/alpha.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/alpha.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/ports/alpha.mdwn	19 Mar 2018 04:46:32 -0000	1.14
+++ wikisrc/ports/alpha.mdwn	19 Jul 2018 10:15:05 -0000	1.15
@@ -1,10 +1,10 @@
 [[!template id=port
 port="alpha"
-cur_rel="7.1.2"
+cur_rel="8.0"
 pkg_rel="7.0"
-future_rel="8.0"
-changes_cur="7.0"
-changes_future="8.0"
+future_rel="9.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/alpha/au-1000.gif"
 about="""
 NetBSD/alpha is a true 64-bit system that fully implements the LP64 architecture,
Index: wikisrc/ports/amd64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amd64.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/ports/amd64.mdwn	19 Mar 2018 04:46:32 -0000	1.23
+++ wikisrc/ports/amd64.mdwn	19 Jul 2018 10:15:05 -0000	1.24
@@ -1,10 +1,10 @@
 [[!template id=port
 port="amd64"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"
 pkg_rel="7.0"
-changes_cur="7.0"
-changes_future="8.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/amd64/AMD_Opteron.gif"
 about="""
 NetBSD/amd64 is a port to the AMD64 family of processors; it
Index: wikisrc/ports/amiga.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amiga.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/ports/amiga.mdwn	19 Mar 2018 04:46:32 -0000	1.18
+++ wikisrc/ports/amiga.mdwn	19 Jul 2018 10:15:05 -0000	1.19
@@ -1,10 +1,10 @@
 [[!template id=port
 port="amiga"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"
 pkg_rel="6.0"
-changes_cur="7.0"
-changes_future="8.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/amiga/header.gif"
 about="""
 NetBSD/amiga is the port of NetBSD to the Amiga line of personal computers by
Index: wikisrc/ports/amigappc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amigappc.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/ports/amigappc.mdwn	19 Mar 2018 04:46:32 -0000	1.14
+++ wikisrc/ports/amigappc.mdwn	19 Jul 2018 10:15:05 -0000	1.15
@@ -1,11 +1,11 @@
 [[!template id=port
 port="amigappc"
 port_alt="powerpc"
-cur_rel="7.1.2"
+cur_rel="8.0"
 pkg_rel="6.0"
-future_rel="8.0"
-changes_cur="7.0"
-changes_future="8.0"
+future_rel="9.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/arm26/arch310.gif"
 no_install_notes="defined"
 about="""
Index: wikisrc/ports/arc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/arc.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/ports/arc.mdwn	19 Mar 2018 04:46:32 -0000	1.15
+++ wikisrc/ports/arc.mdwn	19 Jul 2018 10:15:05 -0000	1.16
@@ -1,10 +1,10 @@
 [[!template id=port
 port="arc"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"
 pkg_rel="6.0"
-changes_cur="7.0"
-changes_future="8.0"
+changes_cur="8.0"
+changes_future="9.0"
 thumbnail="http://www.netbsd.org/images/ports/arc/2200.gif"
 about="""
 NetBSD/arc is a port of NetBSD to the [MIPS](http://www.mips.com) processor
Index: wikisrc/ports/atari.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/atari.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/ports/atari.mdwn	19 Mar 2018 04:46:32 -0000	1.13
+++ wikisrc/ports/atari.mdwn	19 Jul 2018 10:15:05 -0000	1.14
@@ -1,10 +1,10 @@
 [[!template id=port
 port="atari"
-cur_rel="7.1.2"
-future_rel="8.0"
+cur_rel="8.0"
+future_rel="9.0"

(Diff truncated)
Update for 8.0
Index: wikisrc/ports.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/ports.mdwn	14 Apr 2018 03:21:15 -0000	1.15
+++ wikisrc/ports.mdwn	19 Jul 2018 10:06:46 -0000	1.16
@@ -20,14 +20,14 @@
 
 [[!table data="""
 Port		|CPU		|Machines						|Latest Release
-[[amd64]]	|x86_64		|64-bit x86-family machines with AMD and Intel CPUs	|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[evbarm]]	|arm		|ARM evaluation boards					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[evbmips]]	|mips		|MIPS-based evaluation boards				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[evbppc]]	|powerpc	|PowerPC-based evaluation boards			|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[hpcarm]]	|arm		|StrongARM based Windows CE PDA machines		|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[i386]]	|i386		|32-bit x86-family generic machines ("PC clones")	|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sparc64]]	|sparc		|Sun UltraSPARC (64-bit)				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[xen]]		|i386, x86_64	|Xen Virtual Machine Monitor				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
+[[amd64]]	|x86_64		|64-bit x86-family machines with AMD and Intel CPUs	|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[evbarm]]	|arm		|ARM evaluation boards					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[evbmips]]	|mips		|MIPS-based evaluation boards				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[evbppc]]	|powerpc	|PowerPC-based evaluation boards			|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[hpcarm]]	|arm		|StrongARM based Windows CE PDA machines		|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[i386]]	|i386		|32-bit x86-family generic machines ("PC clones")	|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sparc64]]	|sparc		|Sun UltraSPARC (64-bit)				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[xen]]		|i386, x86_64	|Xen Virtual Machine Monitor				|[8.0](http://www.netbsd.org/releases/formal-8/)
 """]]
 
 
@@ -44,55 +44,55 @@
 
 [[!table data="""
 Port		|CPU		|Machines								|Latest Release
-[[acorn32]]	|arm		|Acorn RiscPC/A7000/NC and compatibles					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[algor]]	|mips		|Algorithmics MIPS evaluation boards					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[alpha]]	|alpha		|Digital Alpha (64-bit)							|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[amiga]]	|m68k		|Commodore Amiga, MacroSystem DraCo					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[amigappc]]	|powerpc	|PowerPC-based Amiga boards						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[arc]]		|mips		|Machines following the Advanced RISC Computing spec			|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[atari]]	|m68k		|Atari TT030, Falcon, Hades						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[bebox]]	|powerpc	|Be Inc's BeBox								|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[cats]]	|arm		|Chalice Technology's Strong Arm evaluation board			|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[cesfic]]	|m68k		|CES's FIC8234 VME processor board					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[cobalt]]	|mips		|Cobalt Networks' Microservers						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[dreamcast]]	|[[sh3]]	|Sega Dreamcast game console						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[epoc32]]	|arm		|32bit PSION EPOC PDA							|none
-[[emips]]	|mips		|Machines based on "Extensible MIPS"					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[evbsh3]]	|[[sh3]]	|Evaluation boards with Renesas (Hitachi) Super-H SH3 and SH4 CPUs	|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[ews4800mips]]	|mips		|NEC's MIPS based EWS4800 workstations					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[hp300]]	|m68k		|Hewlett-Packard 9000/300 and 400 series				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[hppa]]	|hppa		|Hewlett-Packard 9000/700 series					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[hpcmips]]	|mips		|MIPS based Windows CE PDA machines					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[hpcsh]]	|[[sh3]]	|Renesas (Hitachi) SH3 and SH4 based Windows CE PDA machines		|[7.1.2](http://www.netbsd.org/releases/formal-7/)
+[[acorn32]]	|arm		|Acorn RiscPC/A7000/NC and compatibles					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[algor]]	|mips		|Algorithmics MIPS evaluation boards					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[alpha]]	|alpha		|Digital Alpha (64-bit)							|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[amiga]]	|m68k		|Commodore Amiga, MacroSystem DraCo					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[amigappc]]	|powerpc	|PowerPC-based Amiga boards						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[arc]]		|mips		|Machines following the Advanced RISC Computing spec			|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[atari]]	|m68k		|Atari TT030, Falcon, Hades						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[bebox]]	|powerpc	|Be Inc's BeBox								|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[cats]]	|arm		|Chalice Technology's Strong Arm evaluation board			|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[cesfic]]	|m68k		|CES's FIC8234 VME processor board					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[cobalt]]	|mips		|Cobalt Networks' Microservers						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[dreamcast]]	|[[sh3]]	|Sega Dreamcast game console						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[epoc32]]	|arm		|32bit PSION EPOC PDA							|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[emips]]	|mips		|Machines based on "Extensible MIPS"					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[evbsh3]]	|[[sh3]]	|Evaluation boards with Renesas (Hitachi) Super-H SH3 and SH4 CPUs	|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[ews4800mips]]	|mips		|NEC's MIPS based EWS4800 workstations					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[hp300]]	|m68k		|Hewlett-Packard 9000/300 and 400 series				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[hppa]]	|hppa		|Hewlett-Packard 9000/700 series					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[hpcmips]]	|mips		|MIPS based Windows CE PDA machines					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[hpcsh]]	|[[sh3]]	|Renesas (Hitachi) SH3 and SH4 based Windows CE PDA machines		|[8.0](http://www.netbsd.org/releases/formal-8/)
 [[ia64]]	|itanium	|Itanium family of processors						|none
-[[ibmnws]]	|powerpc	|IBM Network Station Series 1000					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[iyonix]]	|arm		|Iyonix ARM pc								|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[landisk]]	|[[sh3]]	|SH4 based NAS appliances by I-O DATA					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[luna68k]]	|m68k		|OMRON Tateisi Electronics' LUNA series					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[mac68k]]	|m68k		|Apple Macintosh							|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[macppc]]	|powerpc	|Apple Power Macintosh and clones					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[mipsco]]	|mips		|Mips family of workstations and servers				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[mmeye]]	|[[sh3]]	|Brains' mmEye Multi Media Server					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[mvme68k]]	|m68k		|Motorola MVME 68k SBCs							|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[mvmeppc]]	|powerpc	|Motorola MVME PowerPC SBCs						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[netwinder]]	|arm		|StrongARM based NetWinder machines					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[news68k]]	|arm		|Sony's m68k based "NET WORK STATION" series				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[newsmips]]	|mips		|Sony's MIPS based "NET WORK STATION" series				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[next68k]]	|m68k		|NeXT 68k 'black' hardware						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[ofppc]]	|powerpc	|Generic OpenFirmware compliant PowerPC machines			|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[pmax]]	|mips		|Digital MIPS-based DECstations and DECsystems				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[prep]]	|powerpc	|PReP (PowerPC Reference Platform) and CHRP machines			|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[rs6000]]	|powerpc	|MCA-based IBM RS/6000 workstations					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sandpoint]]	|powerpc	|Motorola Sandpoint reference platform					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sbmips]]	|mips		|Broadcom SiByte evaluation boards					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sgimips]]	|mips		|Silicon Graphics' MIPS-based workstations				|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[shark]]	|arm		|Digital DNARD ("shark")						|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sparc]]	|sparc		|Sun SPARC (32-bit)							|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sun2]]	|m68k		|Sun 2									|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[sun3]]	|m68k		|Sun 3 and 3x								|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[vax]]		|vax		|Digital VAX								|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[x68k]]	|m68k		|Sharp X680x0 series							|[7.1.2](http://www.netbsd.org/releases/formal-7/)
-[[zaurus]]	|arm		|Sharp C7x0/C860/C1000/C3x00 series PDA					|[7.1.2](http://www.netbsd.org/releases/formal-7/)
+[[ibmnws]]	|powerpc	|IBM Network Station Series 1000					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[iyonix]]	|arm		|Iyonix ARM pc								|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[landisk]]	|[[sh3]]	|SH4 based NAS appliances by I-O DATA					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[luna68k]]	|m68k		|OMRON Tateisi Electronics' LUNA series					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[mac68k]]	|m68k		|Apple Macintosh							|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[macppc]]	|powerpc	|Apple Power Macintosh and clones					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[mipsco]]	|mips		|Mips family of workstations and servers				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[mmeye]]	|[[sh3]]	|Brains' mmEye Multi Media Server					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[mvme68k]]	|m68k		|Motorola MVME 68k SBCs							|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[mvmeppc]]	|powerpc	|Motorola MVME PowerPC SBCs						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[netwinder]]	|arm		|StrongARM based NetWinder machines					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[news68k]]	|arm		|Sony's m68k based "NET WORK STATION" series				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[newsmips]]	|mips		|Sony's MIPS based "NET WORK STATION" series				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[next68k]]	|m68k		|NeXT 68k 'black' hardware						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[ofppc]]	|powerpc	|Generic OpenFirmware compliant PowerPC machines			|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[pmax]]	|mips		|Digital MIPS-based DECstations and DECsystems				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[prep]]	|powerpc	|PReP (PowerPC Reference Platform) and CHRP machines			|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[rs6000]]	|powerpc	|MCA-based IBM RS/6000 workstations					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sandpoint]]	|powerpc	|Motorola Sandpoint reference platform					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sbmips]]	|mips		|Broadcom SiByte evaluation boards					|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sgimips]]	|mips		|Silicon Graphics' MIPS-based workstations				|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[shark]]	|arm		|Digital DNARD ("shark")						|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sparc]]	|sparc		|Sun SPARC (32-bit)							|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sun2]]	|m68k		|Sun 2									|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[sun3]]	|m68k		|Sun 3 and 3x								|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[vax]]		|vax		|Digital VAX								|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[x68k]]	|m68k		|Sharp X680x0 series							|[8.0](http://www.netbsd.org/releases/formal-8/)
+[[zaurus]]	|arm		|Sharp C7x0/C860/C1000/C3x00 series PDA					|[8.0](http://www.netbsd.org/releases/formal-8/)
 """]]
 
 

Remove pre-8.0 release hints
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/releng.mdwn	19 Jul 2018 09:57:00 -0000	1.28
+++ wikisrc/releng.mdwn	19 Jul 2018 09:59:46 -0000	1.29
@@ -6,13 +6,10 @@
 
 ## Next Major Release
 
-The next major release will be NetBSD 8.0.  A first release candidate is [available](https://blog.netbsd.org/tnf/entry/netbsd_8_0_release_candidate), no final date for the release has been set yet.
+The next major release will be NetBSD 9.0.
 
-* Next release: NetBSD 8.0
-  + CVS branch tag: <code>netbsd-8</code>
-
-Please give a look to the [[NetBSD 8.0 pre-release task list|netbsd8]] for more
-information about open issues and progress.
+* Next release: NetBSD 9.0
+  + no CVS branch yet
 
 ## Active Major Releases
 

Add the 8 release series
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/releng.mdwn	5 Jun 2018 20:25:53 -0000	1.27
+++ wikisrc/releng.mdwn	19 Jul 2018 09:57:00 -0000	1.28
@@ -16,6 +16,12 @@
 
 ## Active Major Releases
 
+### NetBSD 8.x
+
+* Next minor release: NetBSD 8.1 (No release date proposed)
+  + CVS branch tag: <code>netbsd-8</code>
+* [Current pull-up queue for the netbsd-8 branch](http://releng.netbsd.org/cgi-bin/req-8.cgi)
+
 ### NetBSD 7.x
 
 * Next minor release: NetBSD 7.2 (No release date proposed)

style
Index: wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 15:11:20 -0000	1.9
+++ wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 15:13:41 -0000	1.10
@@ -23,9 +23,7 @@
 
 Kimihiro Nonaka (nonakap@) did the port in a [branch](https://github.com/IIJ-NetBSD/netbsd-src/compare/master...nonakap:nonakap/hyperv) on github.
 
-With his patch applied, you can boot NetBSD on MS Azure:
-
-[dmesg](http://dmesgd.nycbug.org/index.cgi?do=view&id=3628)
+With his patch applied, you can boot NetBSD on MS Azure: [dmesg](http://dmesgd.nycbug.org/index.cgi?do=view&id=3628)
 
 
 

link to branch
Index: wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 15:02:18 -0000	1.8
+++ wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 15:11:20 -0000	1.9
@@ -21,7 +21,7 @@
 
 Yes !
 
-Kimihiro Nonaka (nonakap@) did the port in a branch.
+Kimihiro Nonaka (nonakap@) did the port in a [branch](https://github.com/IIJ-NetBSD/netbsd-src/compare/master...nonakap:nonakap/hyperv) on github.
 
 With his patch applied, you can boot NetBSD on MS Azure:
 

update freebsd link
Index: wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 14:57:02 -0000	1.7
+++ wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 15:02:18 -0000	1.8
@@ -33,7 +33,7 @@
 
 [Marketing material about azure virtual machines](http://www.windowsazure.com/en-us/home/scenarios/virtual-machines/)
 
-[FreeBSD drivers for the Hyper-V virtual machine interface](http://freebsdonhyper-v.github.com/)
+[FreeBSD drivers for the Hyper-V virtual machine interface](https://svnweb.freebsd.org/base/head/sys/dev/hyperv/)
 
 Milestones for this project:
 

update
Index: wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	20 Feb 2015 17:42:22 -0000	1.6
+++ wikisrc/projects/project/netbsd_on_microsoft_azure.mdwn	17 Jul 2018 14:57:02 -0000	1.7
@@ -19,6 +19,16 @@
 
 Would it be possible to push NetBSD onto this platform?
 
+Yes !
+
+Kimihiro Nonaka (nonakap@) did the port in a branch.
+
+With his patch applied, you can boot NetBSD on MS Azure:
+
+[dmesg](http://dmesgd.nycbug.org/index.cgi?do=view&id=3628)
+
+
+
 [Wikipedia article describing the virtualization platform](http://en.wikipedia.org/wiki/Hyper-V)
 
 [Marketing material about azure virtual machines](http://www.windowsazure.com/en-us/home/scenarios/virtual-machines/)
@@ -27,7 +37,6 @@
 
 Milestones for this project:
 
-* booting NetBSD on azure
 * process for automatically building azure-friendly images, similar to amazon AMI
 
 """

Use the present tense for future events.
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- wikisrc/events.mdwn	17 Jul 2018 03:53:13 -0000	1.64
+++ wikisrc/events.mdwn	17 Jul 2018 07:51:25 -0000	1.65
@@ -11,8 +11,6 @@
 Future Events
 -------------
 
-
-
 ### `Sep 2018` - EuroBSDCon 2018, Bucharest, Romania
 
 *September 20 - 23, 2018, University Politehnica of Bucharest, Romania*
@@ -25,19 +23,21 @@
 EuroBSDcon is to exchange knowledge about the BSD operating systems,
 facilitate coordination and cooperation among users and developers.
 
+
 ### `Mar 2019` - AsiaBSDCon 2019, Tokyo, Japan
 
 *March 21 - 24, Tokyo University of Science, Tokyo, Japan*
 
 [AsiaBSDCon](https://www.asiabsdcon.org/) is a
 conference for users and developers on BSD based systems.
-The conference was for anyone developing, deploying and using systems
+The conference is for anyone developing, deploying and using systems
 based on FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Darwin, and MacOS X.
-AsiaBSDCon was a technical conference and aimed to collect the best
+AsiaBSDCon is a technical conference and aims to collect the best
 technical papers and presentations available to ensure that the latest
-developments in our open source community were shared with the widest
+developments in our open source community are shared with the widest
 possible audience.
 
+
 Past Events
 -----------
 

Add: AsiaBSDCon2019
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- wikisrc/events.mdwn	17 Jul 2018 03:48:47 -0000	1.63
+++ wikisrc/events.mdwn	17 Jul 2018 03:53:13 -0000	1.64
@@ -25,6 +25,18 @@
 EuroBSDcon is to exchange knowledge about the BSD operating systems,
 facilitate coordination and cooperation among users and developers.
 
+### `Mar 2019` - AsiaBSDCon 2019, Tokyo, Japan
+
+*March 21 - 24, Tokyo University of Science, Tokyo, Japan*
+
+[AsiaBSDCon](https://www.asiabsdcon.org/) is a
+conference for users and developers on BSD based systems.
+The conference was for anyone developing, deploying and using systems
+based on FreeBSD, NetBSD, OpenBSD, DragonFly BSD, Darwin, and MacOS X.
+AsiaBSDCon was a technical conference and aimed to collect the best
+technical papers and presentations available to ensure that the latest
+developments in our open source community were shared with the widest
+possible audience.
 
 Past Events
 -----------

move past:Japan NetBSD Users Group annual Meeting and BoF
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- wikisrc/events.mdwn	13 Jul 2018 13:56:13 -0000	1.62
+++ wikisrc/events.mdwn	17 Jul 2018 03:48:47 -0000	1.63
@@ -11,21 +11,6 @@
 Future Events
 -------------
 
-### `Jul 2018` - Japan NetBSD Users Group annual Meeting and BoF, Tokyo, Japan
-
-*July 14, 2018, Takeda Building, The University of Tokyo, Japan*
-
-[Japan NetBSD User Group annual Meeting and BoF](http://www.jp.netbsd.org/ja/JP/JNUG/announce/meeting20.html.en)
-is the 20th annual meeting organized by the
-[Japan NetBSD Users Group](http://www.jp.netbsd.org/ja/JP/JNUG/).
-The meeting consists of the 20th Annual Meeting opened to all
-members of JNUG and the NetBSD BoF (Birds of a Feather), the casual
-meeting for individuals who have interests to the NetBSD operating
-system opened to everybody interested.
-
-For more information please see the email on
-[netbsd-advocacy@](//mail-index.netbsd.org/netbsd-advocacy/2018/06/25/msg000776.html)
-mailing list.
 
 
 ### `Sep 2018` - EuroBSDCon 2018, Bucharest, Romania
@@ -44,6 +29,23 @@
 Past Events
 -----------
 
+### `Jul 2018` - Japan NetBSD Users Group annual Meeting and BoF, Tokyo, Japan
+
+*July 14, 2018, Takeda Building, The University of Tokyo, Japan*
+
+[Japan NetBSD User Group annual Meeting and BoF](http://www.jp.netbsd.org/ja/JP/JNUG/announce/meeting20.html.en)
+is the 20th annual meeting organized by the
+[Japan NetBSD Users Group](http://www.jp.netbsd.org/ja/JP/JNUG/).
+The meeting consists of the 20th Annual Meeting opened to all
+members of JNUG and the NetBSD BoF (Birds of a Feather), the casual
+meeting for individuals who have interests to the NetBSD operating
+system opened to everybody interested.
+
+For more information please see the report on
+[netbsd-advocacy@](//mail-index.netbsd.org/netbsd-advocacy/2018/07/17/msg000778.html)
+mailing list.
+
+
 ### `Jul 2018` - pkgsrcCon 2018, Berlin, Germany
 
 *July 7 - 8, 2018, Berlin, Germany*

Mention adding an entry to wscons.conf
ok <maya>, <leot>
Members: 
	tutorials/how_to_turn_off_console_beep.mdwn:1.2->1.3 

Index: wikisrc/tutorials/how_to_turn_off_console_beep.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_turn_off_console_beep.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/how_to_turn_off_console_beep.mdwn	5 Feb 2012 07:14:36 -0000	1.2
+++ wikisrc/tutorials/how_to_turn_off_console_beep.mdwn	15 Jul 2018 23:49:20 -0000	1.3
@@ -41,6 +41,11 @@
 
 The bell pitch defaults to 1500 Hz. Sometimes a lower value is more comfortable. Just keep trying. 
 
+To apply these settings at startup, add them to /etc/wscons.conf. For example:
+
+    setvar wskbd bell.volume 0
+    setvar wskbd bell.pitch  0
+
 #  X11 
 
 If you are working with X11, you can turn off the console beep using the command [[basics/xset]]. 
@@ -67,4 +72,4 @@
 #  See also 
 
   * [wsconsctl(8)](http://netbsd.gw.com/cgi-bin/man-cgi?wsconsctl+8+NetBSD-current)
-
+  * [wscons.conf(5)](http://netbsd.gw.com/cgi-bin/man-cgi?wscons.conf++NetBSD-current)

Move pkgsrcCon 2018 to past events.
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- wikisrc/events.mdwn	26 Jun 2018 12:54:06 -0000	1.61
+++ wikisrc/events.mdwn	13 Jul 2018 13:56:13 -0000	1.62
@@ -11,17 +11,6 @@
 Future Events
 -------------
 
-### `Jul 2018` - pkgsrcCon 2018, Berlin, Germany
-
-*July 7 - 8, 2018, Berlin, Germany*
-
-[pkgsrcCon](//pkgsrc.org/pkgsrcCon/2018/) is the annual technical
-conference for people working on pkgsrc, a framework for building
-over 19,000 open source software packages. pkgsrc is the native
-package manager on NetBSD, SmartOS and Minix, and is portable across
-many different operating systems including Linux and Mac OS X.
-
-
 ### `Jul 2018` - Japan NetBSD Users Group annual Meeting and BoF, Tokyo, Japan
 
 *July 14, 2018, Takeda Building, The University of Tokyo, Japan*
@@ -55,6 +44,17 @@
 Past Events
 -----------
 
+### `Jul 2018` - pkgsrcCon 2018, Berlin, Germany
+
+*July 7 - 8, 2018, Berlin, Germany*
+
+[pkgsrcCon](//pkgsrc.org/pkgsrcCon/2018/) is the annual technical
+conference for people working on pkgsrc, a framework for building
+over 19,000 open source software packages. pkgsrc is the native
+package manager on NetBSD, SmartOS and Minix, and is portable across
+many different operating systems including Linux and Mac OS X.
+
+
 ### `Jun 2018` - BSDCan 2018, Ottawa, Canada
 
 *June 6 - 9, 2018, University of Ottawa, Ottawa, Canada*

removed
--- wikisrc/konqueror.mdwn	2018-07-12 20:29:34.000000000 +0000
+++ /dev/null	2018-07-12 20:29:03.000000000 +0000
@@ -1,103 +0,0 @@
-**Contents**
-
-[[!toc]]
-
-#  Set Up 
-
-Konqueror is part of KDE's "kdebase" package located at _/usr/pkgsrc/x11_ directory. The HTML rendering engine khtml is together with all other needed KDE libraries contained in KDE's "kdelibs" package located at the same place. 
-
-To install Konqueror: 
-    
-    # cd /usr/pkgsrc/x11/kdebase
-    # make
-    # make install
-    
-
-#  Plugins from Netscape, Mozilla, Firefox, etc. 
-
-Konqueror can use Netscape, Mozilla, Firefox plugins by pointing the Konqueror into directory where these plugins are located. 
-
-To see kinds of plugins available in Netscape type in web address location line: 
-    
-    about:plugins
-    
-
-To point the Konqueror into desired plugin go to '_Konqueror -> Settings -> Configure Konqueror -> Plugins_ menu. 
-
-Click _Plugins_ tab, then _new_. 
-
-Global plugins usually located at: 
-    
-    $ /usr/pkg/lib/netscape/plugins
-    
-
-and click _Scan for Plugins -> Ok_ buttons. 
-
-Local plugins may be located at: 
-    
-    $ /home/user/.netscape/plugins/
-    $ /home/user/.firefox/plugins/
-    
-
-#  Java 
-
-To run Java on Konqueror: 
-    
-    # cd /usr/pkgsrc/lang/sun-jdk15
-    # make install
-    
-
-Then go to _Konqueror -> Settings -> Configure Konqueror -> Java & JavaScript_ menu and set path to java as: 
-    
-    /usr/pkg/java/sun-1.5/bin/java
-    
-
-#  RealPlayer 
-
-Create symbolic link in plugin directory: 
-    
-    $ ln -s /usr/pkg/lib/RealPlayer/mozilla/nphelix.so /usr/pkg/lib/netscape/plugins/
-    
-
-Use nspluginwrapper: 
-    
-    $ nspluginwrapper -i /usr/pkg/lib/netscape/plugins/nphelix.so
-    
-
-Check if Konqueror is pointed into this directory and rescan plugins as stated above. 
-
-#  flash 
-
-Find _libflashplayer.so_ file and copy it into plugins directory, for an example to: 
-    
-    /usr/pkg/lib/netscape/plugins/
-    
-
-Use nspluginwrapper: 
-    
-    $ nspluginwrapper -i /usr/pkg/lib/netscape/plugins/nppdf.so
-    
-
-Check if Konqueror is pointed into this directory and rescan plugins as stated above. 
-
-#  Adobe reader 
-
-Create symbolic link in plugin directory: 
-    
-    $ ln -s /usr/pkg/Acrobat7/Browser/intellinux/nppdf.so /usr/pkg/lib/netscape/plugins/
-    
-
-Use nspluginwrapper: 
-    
-    $ nspluginwrapper -i /usr/pkg/lib/netscape/plugins/nppdf.so
-    
-
-Check if Konqueror is pointed into this directory and rescan plugins as stated above. 
-
-#  See also 
-
-  * [[Java]]
-  * [[Adobe Flash]
-  * [[OpenJDK]]
-  * [[Java support in Mozilla]]
-  * [[More Konqueror Plugins]]

ARM64 SMP is supported now.
Index: wikisrc/ports/evbarm/allwinner.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/allwinner.mdwn,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- wikisrc/ports/evbarm/allwinner.mdwn	23 May 2018 21:14:50 -0000	1.91
+++ wikisrc/ports/evbarm/allwinner.mdwn	9 Jul 2018 11:54:39 -0000	1.92
@@ -45,7 +45,7 @@
 
 # Supported hardware
 
-Please refer to the [SUNXI kernel config](https://nxr.netbsd.org/xref/src/sys/arch/evbarm/conf/SUNXI) for the most up-to-date list of supported hardware.
+Please refer to the [32-bit](https://nxr.netbsd.org/xref/src/sys/arch/evbarm/conf/SUNXI) or [64-bit](https://nxr.netbsd.org/xref/src/sys/arch/evbarm/conf/GENERIC64) kernel configs for the most up-to-date list of supported hardware.
 
 <table>
   <thead>
@@ -77,7 +77,7 @@
     <tr><td>RTC</td><td>Yes</td><td></td></tr>
     <tr><td>SATA</td><td>Yes</td><td></td></tr>
     <tr><td>SD/MMC</td><td>Yes</td><td></td></tr>
-    <tr><td>SMP</td><td>Yes</td><td>32-bit only. Uses PSCI support in firmware</td></tr>
+    <tr><td>SMP</td><td>Yes</td><td>PSCI</td></tr>
     <tr><td>SPDIF</td><td>-</td><td></td></tr>
     <tr><td>SPI</td><td>Yes</td><td></td></tr>
     <tr><td>Thermal sensors</td><td>Yes</td><td></td></tr>

APM is no longer relevant for 99% of users.
Having advice on how to use it does more harm than good, if a non-APM
user thinks he needs to recompile a kernel to shutdown.
Heads up by lemonade on IRC, thanks.
Members: 
	tutorials/how_to_poweroff_at_shutdown.mdwn:1.2->1.3(DEAD) 

--- wikisrc/tutorials/how_to_poweroff_at_shutdown.mdwn	2018-07-07 17:55:03.000000000 +0000
+++ /dev/null	2018-07-07 17:55:03.000000000 +0000
@@ -1,71 +0,0 @@
-If you have ATX hardware, for various reasons, you might want your box to poweroff by itself when you shut it down. To achieve this you have to enable [apm(8)](http://netbsd.gw.com/cgi-bin/man-cgi?apm+8+NetBSD-current) in the kernel. Here's how to do it: 
-
-**Contents**
-
-[[!toc]]
-
-#  Obtaining the Sources 
-
-If you are running 3.0, you can get the Sources from the NetBSD FTP Server or from a [Mirror](Get BSD) close to you. If you are running current, you should check out the Sources from a CVS Mirror close to you. 
-    
-
-    # cd /
-    # ftp ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-3.0/source/sets/syssrc.tgz
-    # tar -zxf syssrc.tgz
-    
-
-#  Configure the kernel 
-
-Edit the file `/usr/src/sys/arch/i386/conf` and uncomment _apm_ to enable APM, it should look like: 
-    
-    apm0	at mainbus0			# Advanced power management
-    
-
-Alternatetively, you might want to customize (uncomment) these options: 
-    
-    # Tuning for power management, see apm(4) for more details.
-    #options        APM_NO_IDLE             # Don't call BIOS CPU idle function
-    #options        APM_V10_ONLY            # Use only the APM 1.0 calls
-    #options        APM_NO_POWEROFF         # Don't power off on halt(8)
-    #options        APM_POWER_PRINT         # Print stats on the console
-    #options        APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
-    
-
-#  Build the kernel 
-    
-    # config GENERIC_APM
-    # cd ../compile/GENERIC_APM
-    # make depend; make
-    
-
-If everything went OK, your new APM-enabled-kernel should be located in ./netbsd 
-
-#  Install the kernel 
-    
-    # mv /netbsd /netbsd.old
-    # cp netbsd /
-    # shutdown -r now
-    
-
-Now when you shutdown the box it should poweroff by itself, without the need for the power button to be pressed. 
-
-#  Troubleshooting 
-
-If something went wrong, test with [apm(8)](http://netbsd.gw.com/cgi-bin/man-cgi?apm+8+NetBSD-current). Sample output: 
-    
-
-    root@antfarm:~# apm
-    Battery charge state: absent
-    Battery remaining: 0 percent (0 minutes)
-    A/C adapter state: connected
-    Power management enabled
-    
-
-##  apmd
-
-You will need the apm Daemon _apmd_ running for setting your Notebook fall into sleep. For that please add: 
-    
-    apmd=yes
-    
-
-to your /etc/rc.conf Also see [apmd(8)](http://netbsd.gw.com/cgi-bin/man-cgi?apmd+8+NetBSD-current) for more power management issues. 

point to netbsd blog instead of netbsd.fi which is a dead link
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wikisrc/templates/page.tmpl	25 Jun 2018 18:33:08 -0000	1.48
+++ wikisrc/templates/page.tmpl	29 Jun 2018 14:29:13 -0000	1.49
@@ -101,8 +101,8 @@
 	<li>
 	<a href="//www.NetBSD.org/community/">
 		  Community</a><ul>
-	<li><a href="//netbsd.fi/">
-		    Blogs</a></li>
+	<li><a href="//blog.NetBSD.org/">
+		    Blog</a></li>
 	<li><a href="//www.NetBSD.org/mailinglists/">
 		    Mailing lists</a></li>
 	<li><a href="//mail-index.NetBSD.org/">

Add an anchor to the aarch64 problems wiki page.
Index: wikisrc/users/leot.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/leot.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/leot.mdwn	18 Jun 2018 12:16:52 -0000	1.2
+++ wikisrc/users/leot.mdwn	28 Jun 2018 09:13:59 -0000	1.3
@@ -5,3 +5,7 @@
 If you are looking for information about myself, patches, misc
 files, etc. please give a look to:
 [[leot homepage at www.NetBSD.org|https://www.NetBSD.org/~leot/]].
+
+## wiki pages
+
+* [[Misc aarch64 problems that needs further investigation in order to fill proper PRs and/or fix them!|leot/aarch64_problems]]

Add a note that `ssl' module works.
Index: wikisrc/users/leot/aarch64_problems.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/leot/aarch64_problems.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/leot/aarch64_problems.mdwn	18 Jun 2018 13:16:53 -0000	1.3
+++ wikisrc/users/leot/aarch64_problems.mdwn	28 Jun 2018 09:10:49 -0000	1.4
@@ -49,3 +49,6 @@
     binding.py(128):                 cls.lib.SSL_library_init()
     Illegal instruction (core dumped)
     Exit 132
+
+Please also note that this problem seems limited to `OpenSSL`, `ssl` module
+works.

Add an entry for the `Japan NetBSD Users Group annual Meeting and BoF'.
Thanks to <jun> (all possible mistakes are mine!).
Members: 
	events.mdwn:1.60->1.61 

Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- wikisrc/events.mdwn	16 Jun 2018 09:04:40 -0000	1.60
+++ wikisrc/events.mdwn	26 Jun 2018 12:54:06 -0000	1.61
@@ -22,6 +22,23 @@
 many different operating systems including Linux and Mac OS X.
 
 
+### `Jul 2018` - Japan NetBSD Users Group annual Meeting and BoF, Tokyo, Japan
+
+*July 14, 2018, Takeda Building, The University of Tokyo, Japan*
+
+[Japan NetBSD User Group annual Meeting and BoF](http://www.jp.netbsd.org/ja/JP/JNUG/announce/meeting20.html.en)
+is the 20th annual meeting organized by the
+[Japan NetBSD Users Group](http://www.jp.netbsd.org/ja/JP/JNUG/).
+The meeting consists of the 20th Annual Meeting opened to all
+members of JNUG and the NetBSD BoF (Birds of a Feather), the casual
+meeting for individuals who have interests to the NetBSD operating
+system opened to everybody interested.
+
+For more information please see the email on
+[netbsd-advocacy@](//mail-index.netbsd.org/netbsd-advocacy/2018/06/25/msg000776.html)
+mailing list.
+
+
 ### `Sep 2018` - EuroBSDCon 2018, Bucharest, Romania
 
 *September 20 - 23, 2018, University Politehnica of Bucharest, Romania*

Move the `.whiteOnBlack' section to local.css
It is only used by wikisrc.
Members: 
	global.css:1.7->1.8 
	local.css:1.10->1.11 

Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/global.css	25 Jun 2018 18:33:08 -0000	1.7
+++ wikisrc/global.css	25 Jun 2018 19:14:32 -0000	1.8
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.7 2018/06/25 18:33:08 maya Exp $ */
+/* $NetBSD: global.css,v 1.8 2018/06/25 19:14:32 leot Exp $ */
 
 /* ##### Common Styles ##### */
 
@@ -137,11 +137,6 @@
   text-decoration: none;
 }
 
-.whiteOnBlack {
-  background-color: #ffffff !important;
-  color: #000000 !important;
-}
-
 #navBar {
   font-size: 14px;
   min-width: 1050px;
Index: wikisrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/local.css,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/local.css	25 Jun 2018 13:58:13 -0000	1.10
+++ wikisrc/local.css	25 Jun 2018 19:14:32 -0000	1.11
@@ -43,3 +43,8 @@
 .parentlinks {
   font-size: small;
 }
+
+.whiteOnBlack {
+  background-color: #ffffff !important;
+  color: #000000 !important;
+}

Make the menu visible in the mobile design. (oops)
- Also undo some of the flex change damage
Members: 
	global.css:1.6->1.7 
	templates/page.tmpl:1.47->1.48 

Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/global.css	25 Jun 2018 03:52:45 -0000	1.6
+++ wikisrc/global.css	25 Jun 2018 18:33:08 -0000	1.7
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.6 2018/06/25 03:52:45 maya Exp $ */
+/* $NetBSD: global.css,v 1.7 2018/06/25 18:33:08 maya Exp $ */
 
 /* ##### Common Styles ##### */
 
@@ -816,6 +816,7 @@
 
 	/* hamburger menu wizardry */
 	#navBar ul {
+	  display: inline-block;
 	  margin: 0 !important;
 	}
 
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- wikisrc/templates/page.tmpl	25 Jun 2018 13:49:24 -0000	1.47
+++ wikisrc/templates/page.tmpl	25 Jun 2018 18:33:08 -0000	1.48
@@ -37,6 +37,10 @@
       </div>
     </div>
 
+    <!-- mobile menu icon -->
+    <input id="hamburger" type="checkbox"/>
+    <label class="menuicon" for="hamburger"><span></span></label>
+
     <div id="navBar" role="navigation">
 	<span class="doNotDisplay">
           Navigation:

Align the text of (wiki)pagefooter similarly to the center similarly the main
#footer.
Index: wikisrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/local.css,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/local.css	25 Jun 2018 13:33:23 -0000	1.9
+++ wikisrc/local.css	25 Jun 2018 13:58:13 -0000	1.10
@@ -36,6 +36,10 @@
   margin-bottom: 1em;
 }
 
+.pagefooter {
+  text-align: center;
+}
+
 .parentlinks {
   font-size: small;
 }

Rework a bit the id/class used for footers to make it more consistent with www.n.o.
Every wiki page actually have two footers, previously, from top to bottom:
- #footer: wiki footer
- #footer2: main footer (similar to the one used on www.n.o)
This lead to confusion due CSS style sharing with www.n.o and the wiki footer
was actually treated as the main footer. Adjust that in order to minimize
differences and more possible CSS style sharing, now the two footers are
respectively:
- .pagefooter: wiki footer
- #footer: main footer
Possible further styling of the wiki footer should be done in .pagefooter to
preserve CSS style sharing (if needed we can add a `#wikifooter' or something
similar if an `id' is needed).
This lead to confusion due CSS style sharing with www.n.o and the wiki footer
was actually treated as the main footer. Adjust that in order to minimize
differences and more possible CSS style sharing, now the two footers are
respectively:
 - .pagefooter: wiki footer
 - #footer: main footer

Possible further styling of the wiki footer should be done in .pagefooter to
preserve CSS style sharing (if needed we can add a `#wikifooter' or something
similar if an `id' is needed).

Members: 
	templates/page.tmpl:1.46->1.47 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- wikisrc/templates/page.tmpl	25 Jun 2018 13:07:05 -0000	1.46
+++ wikisrc/templates/page.tmpl	25 Jun 2018 13:49:24 -0000	1.47
@@ -212,7 +212,7 @@
 </TMPL_IF>
 </TMPL_UNLESS>
 
-<div id="footer" class="pagefooter">
+<div class="pagefooter">
 <TMPL_UNLESS DYNAMIC>
 <div id="pageinfo">
 <TMPL_IF NAME="TAGS">
@@ -264,28 +264,23 @@
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
 </TMPL_UNLESS>
 <!-- from <TMPL_VAR WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+</div><!-- .pagefooter -->
 
-<div class="rowOfBoxes">
-  <div id="footer2">
-    <div id="footerLogo">
-		<!-- isc logo used to go here -->
-    </div>
-    <div id="footerContent">
-      <span class="footfeed">
-        <a href="//www.NetBSD.org/cgi-bin/feedback.cgi">
-          Contact</a> |
+<div id="footer">
+  <div id="footerContent">
+    <span class="footfeed">
+      <a href="//www.NetBSD.org/cgi-bin/feedback.cgi">
+        Contact</a> |
+    </span>
+    <span class="footcopy"><a href="about/disclaimer.html">
+      Disclaimer</a> |
+      <span class="copyright">
+        Copyright &copy; 1994-2018 The NetBSD Foundation, Inc.
       </span>
-      <span class="footcopy"><a href="about/disclaimer.html">
-        Disclaimer</a> |
-        <span class="copyright">
-          Copyright &copy; 1994-2018 The NetBSD Foundation, Inc.
-        </span>
-        ALL
-        RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
-        trademark of The NetBSD Foundation, Inc.
-      </span>
-    </div>
+      ALL
+      RIGHTS RESERVED. <br /> NetBSD<sup>&reg;</sup> is a registered
+      trademark of The NetBSD Foundation, Inc.
+    </span>
   </div>
 </div>
 

Add a little top-bottom margin for .pageheader.
Previously (especially on wiki pages without any `parentlinks') the .pageheader
class was very near the navigation bar. This was particularly visible on the
NetBSD wiki main page.
Members: 
	local.css:1.8->1.9 

Index: wikisrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/local.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/local.css	25 Jun 2018 09:51:16 -0000	1.8
+++ wikisrc/local.css	25 Jun 2018 13:33:23 -0000	1.9
@@ -31,6 +31,11 @@
   clear: both;
 }
 
+.pageheader {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
 .parentlinks {
   font-size: small;
 }

Get rid of (probably extra) </TMPL_IF> as well.
(Sorry for possible noise and mistakes but the only way to see if that's fixed
is via directly commiting to the template and see the CVS output or wait for
wiki cron jobs)
Members: 
	templates/page.tmpl:1.45->1.46 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- wikisrc/templates/page.tmpl	25 Jun 2018 13:03:53 -0000	1.45
+++ wikisrc/templates/page.tmpl	25 Jun 2018 13:07:05 -0000	1.46
@@ -212,8 +212,6 @@
 </TMPL_IF>
 </TMPL_UNLESS>
 
-</TMPL_IF>
-
 <div id="footer" class="pagefooter">
 <TMPL_UNLESS DYNAMIC>
 <div id="pageinfo">

Delete a (probably stray) <TMPL_IF NAME="HAVE_ACTIONS">
Should fix extra TMPL_IF pointed out by wiki@ cron jobs via www@.
Members: 
	templates/page.tmpl:1.44->1.45 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/templates/page.tmpl	25 Jun 2018 09:51:16 -0000	1.44
+++ wikisrc/templates/page.tmpl	25 Jun 2018 13:03:53 -0000	1.45
@@ -171,7 +171,6 @@
 	</li>
 	</ul>
     </div>
-<TMPL_IF NAME="HAVE_ACTIONS">
 <div class="pageheader">
 <div class="header">
 <span>

Move searchform to the rightmost part of the menu.
Index: wikisrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/local.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/local.css	24 Jun 2018 18:10:33 -0000	1.7
+++ wikisrc/local.css	25 Jun 2018 09:51:16 -0000	1.8
@@ -12,6 +12,7 @@
   margin: 0; /* need for IE Mac */
   text-align: right; /* need for IE Mac */
   white-space: nowrap; /* for Opera */
+  margin-left: auto;
 }
 
 #searchbox {
Index: wikisrc/pkgsrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/local.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/pkgsrc/local.css	24 Jun 2018 18:10:34 -0000	1.3
+++ wikisrc/pkgsrc/local.css	25 Jun 2018 09:51:16 -0000	1.4
@@ -12,6 +12,7 @@
   margin: 0; /* need for IE Mac */
   text-align: right; /* need for IE Mac */
   white-space: nowrap; /* for Opera */
+  margin-left: auto;
 }
 
 #searchbox {
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/templates/page.tmpl	25 Jun 2018 03:44:14 -0000	1.43
+++ wikisrc/templates/page.tmpl	25 Jun 2018 09:51:16 -0000	1.44
@@ -164,7 +164,7 @@
 		</TMPL_IF>
 	</ul>
 	</li>
-	<li>
+	<li id="searchform">
 		<TMPL_IF NAME="SEARCHFORM">
 		<TMPL_VAR SEARCHFORM>
 		</TMPL_IF>

Don't use searchform id for <form> (going to use it for <li>)
Index: wikisrc/templates/searchform.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/searchform.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/templates/searchform.tmpl	25 Jun 2018 03:43:28 -0000	1.3
+++ wikisrc/templates/searchform.tmpl	25 Jun 2018 09:50:40 -0000	1.4
@@ -1,3 +1,3 @@
-<form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
+<form method="get" action="<TMPL_VAR SEARCHACTION>">
 <input class="whiteOnBlack" type="text" id="searchbox" name="P" value="Search" size="12" maxlength="255" onfocus="if(this.value==this.defaultValue ) this.value='';" /> <input type="submit" value="&#x2315;" aria-label="search" />
 </form>

Make the cursor even more visibly click-able.
Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/global.css	25 Jun 2018 03:32:31 -0000	1.5
+++ wikisrc/global.css	25 Jun 2018 03:52:45 -0000	1.6
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.5 2018/06/25 03:32:31 maya Exp $ */
+/* $NetBSD: global.css,v 1.6 2018/06/25 03:52:45 maya Exp $ */
 
 /* ##### Common Styles ##### */
 
@@ -236,6 +236,7 @@
   border-radius: 25px;
   margin: 5px;
   font-size: 30px;
+  cursor: pointer;
 }
 
 /* ##### Content ##### */

Whitespace commit to regen.
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wikisrc/templates/page.tmpl	25 Jun 2018 03:35:32 -0000	1.42
+++ wikisrc/templates/page.tmpl	25 Jun 2018 03:44:14 -0000	1.43
@@ -171,7 +171,6 @@
 	</li>
 	</ul>
     </div>
-
 <TMPL_IF NAME="HAVE_ACTIONS">
 <div class="pageheader">
 <div class="header">

Remove wrapper div around search box
(Now it matches my local version and is actually veritcally aligned)
Members: 
	templates/searchform.tmpl:1.2->1.3 

Index: wikisrc/templates/searchform.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/searchform.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/templates/searchform.tmpl	25 Jun 2018 03:32:31 -0000	1.2
+++ wikisrc/templates/searchform.tmpl	25 Jun 2018 03:43:28 -0000	1.3
@@ -1,5 +1,3 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
-<div>
 <input class="whiteOnBlack" type="text" id="searchbox" name="P" value="Search" size="12" maxlength="255" onfocus="if(this.value==this.defaultValue ) this.value='';" /> <input type="submit" value="&#x2315;" aria-label="search" />
-</div>
 </form>

Whitespace commit to regen after changing search stuff.
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wikisrc/templates/page.tmpl	25 Jun 2018 03:23:35 -0000	1.41
+++ wikisrc/templates/page.tmpl	25 Jun 2018 03:35:32 -0000	1.42
@@ -171,6 +171,7 @@
 	</li>
 	</ul>
     </div>
+
 <TMPL_IF NAME="HAVE_ACTIONS">
 <div class="pageheader">
 <div class="header">

Use flexbox to make the search option be nice in the menu
(yay vertical align!)
Also use the wrong UTF-8 symbol flipped horizontally for search icon.
Slight transparency trying to make it clear it's a button.
try to use aria-label to make up for lost accessibility.
try to use aria-label to make up for lost accessibility.

Members: 
	global.css:1.4->1.5 
	templates/searchform.tmpl:1.1->1.2 

Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/global.css	18 Jun 2018 12:56:09 -0000	1.4
+++ wikisrc/global.css	25 Jun 2018 03:32:31 -0000	1.5
@@ -1,4 +1,4 @@
-/* $NetBSD: global.css,v 1.4 2018/06/18 12:56:09 leot Exp $ */
+/* $NetBSD: global.css,v 1.5 2018/06/25 03:32:31 maya Exp $ */
 
 /* ##### Common Styles ##### */
 
@@ -159,6 +159,7 @@
   padding: 0;
   list-style: none outside none;
   display: inline;
+  display: flex;
 }
 
 #navBar ul li {
@@ -215,6 +216,28 @@
   display: block;
 }
 
+#navBar form { 
+  background: #444;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+
+#navBar input[type=submit] {
+  -moz-transform: scale(-1, 1);
+  -webkit-transform: scale(-1, 1);
+  -o-transform: scale(-1, 1);
+  -ms-transform: scale(-1, 1);
+  transform: scale(-1, 1);
+  border: 0;
+  color: white;
+  background: rgba(255, 255, 255, 0.03);
+  border-radius: 25px;
+  margin: 5px;
+  font-size: 30px;
+}
+
 /* ##### Content ##### */
 
 .title {
Index: wikisrc/templates/searchform.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/searchform.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/templates/searchform.tmpl	4 May 2010 03:02:33 -0000	1.1
+++ wikisrc/templates/searchform.tmpl	25 Jun 2018 03:32:31 -0000	1.2
@@ -1,5 +1,5 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input class="whiteOnBlack" type="text" id="searchbox" name="P" value="Search" size="12" maxlength="255" onfocus="if(this.value==this.defaultValue ) this.value='';" /> <input type="submit" value="Search" />
+<input class="whiteOnBlack" type="text" id="searchbox" name="P" value="Search" size="12" maxlength="255" onfocus="if(this.value==this.defaultValue ) this.value='';" /> <input type="submit" value="&#x2315;" aria-label="search" />
 </div>
 </form>

Put search box inside <li> too
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wikisrc/templates/page.tmpl	24 Jun 2018 19:46:23 -0000	1.40
+++ wikisrc/templates/page.tmpl	25 Jun 2018 03:23:35 -0000	1.41
@@ -164,9 +164,11 @@
 		</TMPL_IF>
 	</ul>
 	</li>
+	<li>
 		<TMPL_IF NAME="SEARCHFORM">
 		<TMPL_VAR SEARCHFORM>
 		</TMPL_IF>
+	</li>
 	</ul>
     </div>
 <TMPL_IF NAME="HAVE_ACTIONS">

Move the search into the actual menu HTML-wise
shouldn't be visually different.
Members: 
	templates/page.tmpl:1.39->1.40 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- wikisrc/templates/page.tmpl	24 Jun 2018 18:03:23 -0000	1.39
+++ wikisrc/templates/page.tmpl	24 Jun 2018 19:46:23 -0000	1.40
@@ -35,13 +35,6 @@
         <div id="name"><a href="//www.NetBSD.org/">The NetBSD Project</a></div>
         <div id="slogan"><a href="//www.NetBSD.org/">&ldquo;Of course it runs NetBSD&rdquo;</a></div>
       </div>
-      <div id="headerTools">
-	<div id="headerSearch">
-<TMPL_IF NAME="SEARCHFORM">
-<TMPL_VAR SEARCHFORM>
-</TMPL_IF>
-	</div>
-      </div>
     </div>
 
     <div id="navBar" role="navigation">
@@ -171,6 +164,9 @@
 		</TMPL_IF>
 	</ul>
 	</li>
+		<TMPL_IF NAME="SEARCHFORM">
+		<TMPL_VAR SEARCHFORM>
+		</TMPL_IF>
 	</ul>
     </div>
 <TMPL_IF NAME="HAVE_ACTIONS">

Remove newly redundant styling for .actions
pkgsrc seems to also be affected by page.tmpl.
it's unclear why pkgsrc has its own style, but it might be because it
affects more things which are unknown to me.
(Revert this commit if it breaks stuff!)
Members: 
	local.css:1.6->1.7 
	pkgsrc/local.css:1.2->1.3 

Index: wikisrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/local.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/local.css	8 Aug 2012 22:27:45 -0000	1.6
+++ wikisrc/local.css	24 Jun 2018 18:10:33 -0000	1.7
@@ -24,29 +24,6 @@
   width: 5em;
 }
 
-.actions {
-  float: right;
-}
-
-.actions ul {
-  padding: 2px 2px 4px;
-  background: #F26711;
-}
-
-.actions ul li {
-  padding: 0 5px 0 7px;
-  border-left: 1px solid white;
-}
-
-.actions ul li:first-child {
-  border-left: none;
-}
-
-.actions ul li a,.actions ul li a:hover {
-  color: white;
-  font-weight: bold;
-}
-
 .pageheader, #content {
   margin-left: 25px;
   margin-right: 15px;
Index: wikisrc/pkgsrc/local.css
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/local.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/pkgsrc/local.css	14 May 2017 11:11:59 -0000	1.2
+++ wikisrc/pkgsrc/local.css	24 Jun 2018 18:10:34 -0000	1.3
@@ -24,29 +24,6 @@
   width: 5em;
 }
 
-.actions {
-  float: right;
-}
-
-.actions ul {
-  padding: 2px 2px 4px;
-  background: #F26711;
-}
-
-.actions ul li {
-  padding: 0 5px 0 7px;
-  border-left: 1px solid white;
-}
-
-.actions ul li:first-child {
-  border-left: none;
-}
-
-.actions ul li a,.actions ul li a:hover {
-  color: white;
-  font-weight: bold;
-}
-
 .pageheader, #content {
   margin-left: 25px;
   margin-right: 15px;

try to quiet errors about not having a matched endif.
the matching "endif" was far ahead, add a second if to things previously
guarded by "TMPL_IF HAVE_ACTIONS"
the menu will have a 'wiki' entry without a drop down menu if the statement
is false.
the menu will have a 'wiki' entry without a drop down menu if the statement
is false.

Members: 
	templates/page.tmpl:1.38->1.39 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- wikisrc/templates/page.tmpl	24 Jun 2018 17:55:53 -0000	1.38
+++ wikisrc/templates/page.tmpl	24 Jun 2018 18:03:23 -0000	1.39
@@ -173,7 +173,7 @@
 	</li>
 	</ul>
     </div>
-
+<TMPL_IF NAME="HAVE_ACTIONS">
 <div class="pageheader">
 <div class="header">
 <span>

Get rid of custom wiki extra menu.
It's now part of the regular menu.
Members: 
	templates/page.tmpl:1.37->1.38 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wikisrc/templates/page.tmpl	24 Jun 2018 17:51:33 -0000	1.37
+++ wikisrc/templates/page.tmpl	24 Jun 2018 17:55:53 -0000	1.38
@@ -173,29 +173,6 @@
 	</li>
 	</ul>
     </div>
- 
-<TMPL_IF NAME="HAVE_ACTIONS">
-    <div class="actions">
-        <ul>
-        <li><a href="<TMPL_VAR BASEURL>">Wiki Home</a></li>
-        <TMPL_IF NAME="EDITURL">
-        <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-        </TMPL_IF>
-        <TMPL_IF NAME="COMMENTSLINK">
-        <li><TMPL_VAR COMMENTSLINK></li>
-        </TMPL_IF>
-        <TMPL_IF NAME="GETSOURCEURL">
-        <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
-        </TMPL_IF>
-        <TMPL_IF NAME="HISTORYURL">
-        <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
-        </TMPL_IF>
-        <li><a href="<TMPL_VAR BASEURL>wiki/new_page" rel="nofollow">New</a></li>
-        <TMPL_IF NAME="RECENTCHANGESURL">
-        <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
-        </TMPL_IF>
-        </ul>
-    </div>
 
 <div class="pageheader">
 <div class="header">

Integrate wiki functionality into menu
This makes the comment button less visible, but it's still at the bottom
of the page.
Members: 
	templates/page.tmpl:1.36->1.37 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/templates/page.tmpl	24 Jun 2018 17:32:38 -0000	1.36
+++ wikisrc/templates/page.tmpl	24 Jun 2018 17:51:33 -0000	1.37
@@ -143,6 +143,34 @@
 		    Release engineering</a></li>
 	</ul>
 	</li>
+	<li>
+	<a href="<TMPL_VAR BASEURL>">
+		Wiki</a><ul>
+		<TMPL_IF NAME="HAVE_ACTIONS">
+			<TMPL_IF NAME="EDITURL">
+			<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">
+				    Edit</a></li>
+			</TMPL_IF>
+			<TMPL_IF NAME="COMMENTSLINK">
+			<li><TMPL_VAR COMMENTSLINK></li>
+			</TMPL_IF>
+			<TMPL_IF NAME="GETSOURCEURL">
+			<li><a href="<TMPL_VAR GETSOURCEURL>">
+				    Source</a></li>
+			</TMPL_IF>
+			<TMPL_IF NAME="HISTORYURL">
+			<li><a href="<TMPL_VAR HISTORYURL>">
+				    History</a></li>
+			</TMPL_IF>
+			<li><a href="<TMPL_VAR BASEURL>wiki/new_page" rel="nofollow">
+				    New</a></li>
+			<TMPL_IF NAME="RECENTCHANGESURL">
+			<li><a href="<TMPL_VAR RECENTCHANGESURL>">
+				    Recent Changes</a></li>
+			</TMPL_IF>
+		</TMPL_IF>
+	</ul>
+	</li>
 	</ul>
     </div>
  

Catch up with menu items being changed.
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/templates/page.tmpl	1 Jan 2018 03:51:04 -0000	1.35
+++ wikisrc/templates/page.tmpl	24 Jun 2018 17:32:38 -0000	1.36
@@ -69,8 +69,8 @@
 		  About</a><ul>
 	<li><a href="//www.NetBSD.org/about/">
 		    NetBSD</a></li>
-	<li><a href="//www.NetBSD.org/foundation/">
-		    The NetBSD Foundation</a></li>
+	<li><a href="//www.NetBSD.org/people/developers.html">
+		    NetBSD developers</a></li>
 	<li><a href="//www.NetBSD.org/gallery/">
 		    Advocacy</a></li>
 	</ul>

suggest dhcpcd.
Index: wikisrc/guide/boot.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/boot.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/guide/boot.mdwn	4 Jul 2016 05:44:30 -0000	1.7
+++ wikisrc/guide/boot.mdwn	22 Jun 2018 21:17:28 -0000	1.8
@@ -335,7 +335,7 @@
 
  * Set `rc_configured=YES` (this modification should already have been done by
    the installation software.)
- * Set `dhclient=YES` to configure your system's network using DHCP.
+ * Set `dhcpcd=YES` to configure your system's network using DHCP.
  * Define a `hostname` for your machine (use a fully qualified hostname, i.e.,
    one including domain). If you have a standalone machine you can use any name
    (for example, `vigor3.your.domain`). If your machine is connected to a

More dhclient references.
Index: wikisrc/tutorials/how_to_set_up_a_dhcp_server.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_set_up_a_dhcp_server.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/how_to_set_up_a_dhcp_server.mdwn	5 Feb 2012 07:14:36 -0000	1.2
+++ wikisrc/tutorials/how_to_set_up_a_dhcp_server.mdwn	22 Jun 2018 21:16:49 -0000	1.3
@@ -41,9 +41,9 @@
     # /etc/rc.d/dhcpd start
     
 
-To test if your dhcp server is running, run _dhclient_ on another host on the same network. 
+To test if your dhcp server is running, run _dhcpcd_ on another host on the same network. 
     
-    # dhclient
+    # dhcpcd
     
 
 Also check your /var/db/dhcpd.leases file. That's it. Have fun. 

Refer to dhcpcd.
XXX why does this page suggest SLIP
Members: 
	guide/net-practice.mdwn:1.5->1.6 

Index: wikisrc/guide/net-practice.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/net-practice.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/guide/net-practice.mdwn	19 Jun 2015 19:18:31 -0000	1.5
+++ wikisrc/guide/net-practice.mdwn	22 Jun 2018 21:15:35 -0000	1.6
@@ -947,7 +947,7 @@
 to clients on request. To make a NetBSD client run in such an environment, it's 
 usually enough to set
 
-    dhclient=yes
+    dhcpcd=yes
 
 in `/etc/rc.conf`, and the IP address will be set automatically, 
 `/etc/resolv.conf` will be created and routing setup to the default router.

Refer to dhcpcd.
No idea why would want to view its lease files, they don't appear to be
human-readable.
Members: 
	the_netbsd_system_manager__39__s_manual.mdwn:1.2->1.3 

Index: wikisrc/the_netbsd_system_manager__39__s_manual.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/the_netbsd_system_manager__39__s_manual.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/the_netbsd_system_manager__39__s_manual.mdwn	5 Feb 2012 07:14:36 -0000	1.2
+++ wikisrc/the_netbsd_system_manager__39__s_manual.mdwn	22 Jun 2018 21:14:08 -0000	1.3
@@ -893,15 +893,10 @@
 
 ##  View and renew a DHCP lease 
 
-View a DHCP lease 
-    
-    $ less /var/db/dhclient.leases
-    
-
 Renew a DHCP lease 
     
-    # dhclient -r
-    # dhclient
+    # dhcpcd -k
+    # dhcpcd
     
 
 ##  Recognize when and how to set or remove an interface alias 

s/rtsol/dhcpcd
Index: wikisrc/ports/hpcmips/pocketv6.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hpcmips/pocketv6.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/ports/hpcmips/pocketv6.mdwn	14 Jan 2014 13:41:40 -0000	1.2
+++ wikisrc/ports/hpcmips/pocketv6.mdwn	22 Jun 2018 21:12:01 -0000	1.3
@@ -12,7 +12,7 @@
 and information on the pocket IPv6 environment.
 
 NetBSD/hpcmips supports IPv6 & IPsec the same as other NetBSD ports.
-Applications such as rtsol, ping6, and traceroute6, work fine on a
+Applications such as dhcpcd, ping6, and traceroute6, work fine on a
 GENERIC kernel configuration. NetBSD/hpcmips is a good solution for
 small-battery drive-lowcost IPv6 mobile computing environment.
 

Try to bring this up to date.
Index: wikisrc/users/rkujawa.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa.mdwn,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- wikisrc/users/rkujawa.mdwn	27 Feb 2014 19:58:24 -0000	1.40
+++ wikisrc/users/rkujawa.mdwn	21 Jun 2018 12:53:02 -0000	1.41
@@ -1,5 +1,7 @@
 In June 2011 I've officialy joined the NetBSD Foundation. I'm mostly hacking on amiga and amigappc ports.
 
+Currently I am not very active due to personal problems (and lack of time caused by the mentioned problems).
+
 # My NetBSD projects
 
 ## Completed projects 
@@ -26,15 +28,12 @@
 * [[mpl115a|http://netbsd.gw.com/cgi-bin/man-cgi?mpl115a++NetBSD-current]] - Freescale MPL115A2 pressure sensor driver.
 * [[acafh|http://netbsd.gw.com/cgi-bin/man-cgi?acafh+4.amiga+NetBSD-current]] - Individual Computers ACA500 driver.
 * mcp48x1dac - Microchip MCP48x1 series DAC driver.
-
-## Ongoing projects
-
-* mgafb - Matrox Millenium II (and probably other old Matroxes) framebuffer driver.
-* Migration of grf+ite console drivers to wscons (with Frank Wille).
-* [[ClockNet|users/rkujawa/clocknet]]
+* Migration of amiga grf+ite console drivers to wscons (with Frank Wille). Mostly done but there are still some drivers for less popular hardware left to convert.
 
 ## Planned projects
 
+* mgafb - Matrox Millenium II (and probably other old Matroxes) framebuffer driver. I have some source written for this already, but project stalled due to lack of time.
+* [[ClockNet|users/rkujawa/clocknet]]
 * Support for VIA Envy24HT based sound cards, like Audiotrak Prodigy HD2 Advance. Evaluate OpenBSD and FreeBSD drivers, port one or write new.
 * SUBWAY USB controller (based on UHC124 chip) driver.
 * Migration of amiga port from XFree to Xorg (with Frank Wille).

Delete usbhidctl possible problem, no longer able to reproduce that.
Index: wikisrc/users/leot/aarch64_problems.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/leot/aarch64_problems.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/leot/aarch64_problems.mdwn	18 Jun 2018 12:42:27 -0000	1.2
+++ wikisrc/users/leot/aarch64_problems.mdwn	18 Jun 2018 13:16:53 -0000	1.3
@@ -4,16 +4,6 @@
 investigation in order to write proper PR or better yet to fix them!
 
 
-## `usbhidctl` and NetBSD crashes on Pinebook
-
-At least by running:
-
-    # usbhidctl -f uhid4 -r
-
-it is possible to crash the Pinebook. Investigate why and if possible get a
-complete backtrace.
-
-
 ## `mpv` and NetBSD crashes
 Just by invoking `mpv` via:
 

Sync with htdocs/global.css,v 1.67
Worth differences:
- .whiteOnBlack is still present because used on wikisrc
- Google CSE styles doesn't seem no longer used, they were deleted
Members: 
	global.css:1.3->1.4 

Index: wikisrc/global.css
===================================================================
RCS file: /cvsroot/wikisrc/global.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/global.css	28 Jun 2016 08:56:14 -0000	1.3
+++ wikisrc/global.css	18 Jun 2018 12:56:09 -0000	1.4
@@ -1,13 +1,12 @@
+/* $NetBSD: global.css,v 1.4 2018/06/18 12:56:09 leot Exp $ */
+
 /* ##### Common Styles ##### */
 
 body {
   background-color: #ffffff;
   color: #000000;
-  font-family: Tahoma, sans-serif;
-  font-size: small;
-  line-height: 1.3em;
+  font-family: 'Roboto', Tahoma, sans-serif;
   margin: 0;
-  padding: 0;
 }
 
 acronym, .titleTip {
@@ -22,12 +21,12 @@
 }
 
 a:link {
-  color: #b84e0d;
+  color: #fd6720;
   text-decoration: none;
 }
 
 a:hover {
-  color: #f26711;
+  color: #fd6720;
   text-decoration: underline;
 }
 
@@ -37,10 +36,14 @@
 }
 
 a:visited:hover {
-  color: #f26711;
+  color: #fd6720;
   text-decoration: underline;
 }
 
+h1 {
+  line-height: 1em;
+}
+
 h3 {
   color: #777777;
 }
@@ -49,6 +52,10 @@
   color: #777777;
 }
 
+pre {
+  white-space: pre-wrap;
+}
+
 .doNotDisplay {
   display: none !important;
 }
@@ -121,7 +128,7 @@
 }
 
 #logo #slogan a {
-  color: #F26711;
+  color: #fd6720;
   font-style: italic;
   font-size: 21px;
 }
@@ -130,71 +137,21 @@
   text-decoration: none;
 }
 
-#headerLangs a {
-  color: #777777;
-  background-color: transparent;
-  text-decoration: none;
-  margin: 0;
-  padding: 0 0 0.5ex 0;
-}
-
-#headerLangs a:hover {
-  color: #f26711;
-  background-color: transparent;
-  text-decoration: underline;
-}
-
-#headerLangs {
-  position: absolute;
-  top: 2.5em;
-  right: 1em;
-  white-space: nowrap;
-}
-
 .whiteOnBlack {
   background-color: #ffffff !important;
   color: #000000 !important;
 }
 
-#headerMirrors select {
-  font-size: 12px;
-}
-
-#headerTools {
-  text-align: right;
-  position: absolute;
-  top: 20px;
-  right: 1em;
-  margin: 0;
-  width: 22em;
-}
-
-#headerTools input {
-  background-color: #eeeeee;
-  color: #555555;
-  border: 1px solid #d4d4d4;
-  padding: 1px 5px 1px 5px;
-  font-size: small;
-  width: 5em;
-}
-
-#headerTools input[type=text] {
-  margin-right: 5px;
-  width: 13em;
-}
-
 #navBar {
   font-size: 14px;
-  font-weight: bold;
-  min-width: 900px;
-  background: url("./images/navbar-gradient.png") repeat-x scroll 0% 0% rgb(54, 54, 54);
-  background-color: rgb(54, 54, 54);
+  min-width: 1050px;
+  background-color: #444;
 }
 
 #navBar a {
   display: block;
   color: #ffffff;
-  padding: 0.7em 0.5em 0.7em 0.5em;
+  padding: 1em;
 }
 
 #navBar ul {
@@ -205,6 +162,8 @@
 }
 
 #navBar ul li {
+  border: solid rgba(0, 0, 0, .05);
+  border-width: 0 1px 0 0;
   display: inline-block;
   position: relative;
   *display: inline; /* for IE 7 compatibility */
@@ -229,27 +188,27 @@
 
 #navBar ul li ul li a {
   min-width: 8em;
-  border-left:  1px solid #F26711;
-  border-right: 1px solid #F26711;
+  border-left:  1px solid #fd6720;
+  border-right: 1px solid #fd6720;
 }
 
 #navBar ul li ul li:first-child a {
-  border-top: 1px solid #F26711;
+  border-top: 1px solid #fd6720;
 }
 
 #navBar ul li ul li:last-child a {
-  border-bottom: 1px solid #F26711;
+  border-bottom: 1px solid #fd6720;
 }
 
 #navBar ul li:hover ul li a {
   text-decoration: none;
-  color: #F26711;
+  color: #fd6720;
   background-color: #FFF2E1;
 }
 
 #navBar ul li:hover ul li a:hover {
   color: #FFFFFF;
-  background-color: #F26711;
+  background-color: #fd6720;
 }
 
 #navBar ul li ul li, #navBar ul li:hover ul {
@@ -383,7 +342,7 @@
 }
 

(Diff truncated)
Code blocks syntax is 4 spaces or 1 tab, not four `!
Index: wikisrc/users/leot/aarch64_problems.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/leot/aarch64_problems.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/leot/aarch64_problems.mdwn	18 Jun 2018 12:30:36 -0000	1.1
+++ wikisrc/users/leot/aarch64_problems.mdwn	18 Jun 2018 12:42:27 -0000	1.2
@@ -8,9 +8,7 @@
 
 At least by running:
 
-````
-# usbhidctl -f uhid4 -r
-````
+    # usbhidctl -f uhid4 -r
 
 it is possible to crash the Pinebook. Investigate why and if possible get a
 complete backtrace.
@@ -19,9 +17,7 @@
 ## `mpv` and NetBSD crashes
 Just by invoking `mpv` via:
 
-````
-$ mpv
-````
+    $ mpv
 
 It is possible to completely crash NetBSD on aarch64. Investigate why and if
 possible get a complete backtrace.
@@ -32,40 +28,34 @@
 ## Python `import requests` SIGILLs
 Doing a (please note that also `python36` is affected):
 
-````
-$ python2.7 -c 'import requests'
-Illegal instruction (core dumped)
-Exit 132
-````
+    $ python2.7 -c 'import requests'
+    Illegal instruction (core dumped)
+    Exit 132
 
 leads to a SIGILL. Trying to reduce the test case this also happens with just a:
 
-````
-$ python2.7 -c 'import OpenSSL'
-Illegal instruction (core dumped)
-Exit 132
-````
+    $ python2.7 -c 'import OpenSSL'
+    Illegal instruction (core dumped)
+    Exit 132
 
 Trying to debug this a bit further we can see:
 
-````
-% cat asi.py
-import OpenSSL
-% python2.7 -m trace --trace asi.py
-[...]
-binding.py(88):     for attr in dir(lib):
-binding.py(89):         if attr not in excluded_names:
-binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
-binding.py(88):     for attr in dir(lib):
-binding.py(89):         if attr not in excluded_names:
-binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
-binding.py(88):     for attr in dir(lib):
-binding.py(89):         if attr not in excluded_names:
-binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
-binding.py(88):     for attr in dir(lib):
-binding.py(92):     return conditional_lib
-binding.py(126):                 cls._lib_loaded = True
-binding.py(128):                 cls.lib.SSL_library_init()
-Illegal instruction (core dumped)
-Exit 132
-````
+    % cat asi.py
+    import OpenSSL
+    % python2.7 -m trace --trace asi.py
+    [...]
+    binding.py(88):     for attr in dir(lib):
+    binding.py(89):         if attr not in excluded_names:
+    binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
+    binding.py(88):     for attr in dir(lib):
+    binding.py(89):         if attr not in excluded_names:
+    binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
+    binding.py(88):     for attr in dir(lib):
+    binding.py(89):         if attr not in excluded_names:
+    binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
+    binding.py(88):     for attr in dir(lib):
+    binding.py(92):     return conditional_lib
+    binding.py(126):                 cls._lib_loaded = True
+    binding.py(128):                 cls.lib.SSL_library_init()
+    Illegal instruction (core dumped)
+    Exit 132

Add a wiki page with some aarch64/Pinebook problems that needs further
investigations.
--- /dev/null	2018-06-18 12:30:02.000000000 +0000
+++ wikisrc/users/leot/aarch64_problems.mdwn	2018-06-18 12:30:54.000000000 +0000
@@ -0,0 +1,71 @@
+# Various (possible) problems of aarch64
+
+Here a list of possible problems of NetBSD/evbarm aarch64 that needs further
+investigation in order to write proper PR or better yet to fix them!
+
+
+## `usbhidctl` and NetBSD crashes on Pinebook
+
+At least by running:
+
+````
+# usbhidctl -f uhid4 -r
+````
+
+it is possible to crash the Pinebook. Investigate why and if possible get a
+complete backtrace.
+
+
+## `mpv` and NetBSD crashes
+Just by invoking `mpv` via:
+
+````
+$ mpv
+````
+
+It is possible to completely crash NetBSD on aarch64. Investigate why and if
+possible get a complete backtrace.
+
+(Is it PaX MPROTECT related?)
+
+
+## Python `import requests` SIGILLs
+Doing a (please note that also `python36` is affected):
+
+````
+$ python2.7 -c 'import requests'
+Illegal instruction (core dumped)
+Exit 132
+````
+
+leads to a SIGILL. Trying to reduce the test case this also happens with just a:
+
+````
+$ python2.7 -c 'import OpenSSL'
+Illegal instruction (core dumped)
+Exit 132
+````
+
+Trying to debug this a bit further we can see:
+
+````
+% cat asi.py
+import OpenSSL
+% python2.7 -m trace --trace asi.py
+[...]
+binding.py(88):     for attr in dir(lib):
+binding.py(89):         if attr not in excluded_names:
+binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
+binding.py(88):     for attr in dir(lib):
+binding.py(89):         if attr not in excluded_names:
+binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
+binding.py(88):     for attr in dir(lib):
+binding.py(89):         if attr not in excluded_names:
+binding.py(90):             setattr(conditional_lib, attr, getattr(lib, attr))
+binding.py(88):     for attr in dir(lib):
+binding.py(92):     return conditional_lib
+binding.py(126):                 cls._lib_loaded = True
+binding.py(128):                 cls.lib.SSL_library_init()
+Illegal instruction (core dumped)
+Exit 132
+````

Fix the anchor (hopefully).
Index: wikisrc/users/leot.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/leot.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/leot.mdwn	18 Jun 2018 12:14:42 -0000	1.1
+++ wikisrc/users/leot.mdwn	18 Jun 2018 12:16:52 -0000	1.2
@@ -4,4 +4,4 @@
 
 If you are looking for information about myself, patches, misc
 files, etc. please give a look to:
-[[leot homepage at www.NetBSD.org|//www.NetBSD.org/~leot/]].
+[[leot homepage at www.NetBSD.org|https://www.NetBSD.org/~leot/]].

Add a leot wiki page.
Nothing interesting ATM but it will probably contain TODO/WIP notes.
Members: 
	users/leot.mdwn:INITIAL->1.1 

--- /dev/null	2018-06-18 12:14:01.000000000 +0000
+++ wikisrc/users/leot.mdwn	2018-06-18 12:14:58.000000000 +0000
@@ -0,0 +1,7 @@
+[[!meta title="Leonardo Taccari (leot)"]]
+
+Welcome to this wiki page!
+
+If you are looking for information about myself, patches, misc
+files, etc. please give a look to:
+[[leot homepage at www.NetBSD.org|//www.NetBSD.org/~leot/]].

Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- wikisrc/ports/xen/howto.mdwn	29 May 2018 01:09:16 -0000	1.142
+++ wikisrc/ports/xen/howto.mdwn	17 Jun 2018 21:11:00 -0000	1.143
@@ -1170,7 +1170,7 @@
 Amazon
 ------
 
-See the [Amazon EC2 page](../amazon_ec2/).
+See the [Amazon EC2 page](/amazon_ec2/).
 
 Using npf
 ---------

Move BSDCan to past events.
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- wikisrc/events.mdwn	22 Mar 2018 16:12:27 -0000	1.59
+++ wikisrc/events.mdwn	16 Jun 2018 09:04:40 -0000	1.60
@@ -11,18 +11,6 @@
 Future Events
 -------------
 
-### `Jun 2018` - BSDCan 2018, Ottawa, Canada
-
-*June 6 - 9, 2018, University of Ottawa, Ottawa, Canada*
-
-[BSDCan](https://www.bsdcan.org/2018/), a BSD conference held in
-Ottawa, Canada, quickly established itself as the technical conference
-for people working on and with 4.4BSD based operating systems and
-related projects. The organizers have found a fantastic formula
-that appeals to a wide range of people from extreme novices to
-advanced developers.
-
-
 ### `Jul 2018` - pkgsrcCon 2018, Berlin, Germany
 
 *July 7 - 8, 2018, Berlin, Germany*
@@ -50,6 +38,18 @@
 Past Events
 -----------
 
+### `Jun 2018` - BSDCan 2018, Ottawa, Canada
+
+*June 6 - 9, 2018, University of Ottawa, Ottawa, Canada*
+
+[BSDCan](https://www.bsdcan.org/2018/), a BSD conference held in
+Ottawa, Canada, quickly established itself as the technical conference
+for people working on and with 4.4BSD based operating systems and
+related projects. The organizers have found a fantastic formula
+that appeals to a wide range of people from extreme novices to
+advanced developers.
+
+
 ### `Mar 2018` - AsiaBSDCon 2018, Tokyo, Japan
 
 *March 8 - 11, Tokyo University of Science, Tokyo, Japan*

Some backports in netbsd-8, and add a note about the missing parts of
retpoline/rsb.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/security/meltdown_spectre.mdwn	23 May 2018 07:47:07 -0000	1.36
+++ wikisrc/security/meltdown_spectre.mdwn	14 Jun 2018 14:40:40 -0000	1.37
@@ -37,9 +37,9 @@
 [[!table data="""
 Port		|Vendor/Model	|Spectre (V2)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigB] [MitigD]
-amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
+amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigC] [MitigD]	|Fixed [MitigC] [MitigD]
 i386		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigD]
-i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
+i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigC] [MitigD]	|Fixed [MitigC] [MitigD]
 mips		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS (others)	|Not vulnerable	|		|		|
@@ -86,10 +86,10 @@
 
 [[!table data="""
 Port		|Vendor/Model	|Spectre (V4)	|NetBSD-7	|NetBSD-8	|NetBSD-current
-amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-amd64		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
-i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
+amd64		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigE]	|Fixed [MitigE]
+amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigF]	|Fixed [MitigF]
+i386		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigE]	|Fixed [MitigE]
+i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigF]	|Fixed [MitigF]
 arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 arm		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
@@ -138,6 +138,9 @@
 Software mitigation. It is enabled by default in GENERIC. When enabled,
 the "swmitigated" sysctl is set to one.
 
+Note: there is no retpoline for the ASM parts, and no RSB-stuffing either
+for Skylake.
+
 ### Mitigations E, F
 
 There are two available mitigations for SpectreV4. Their availability

Spelling and punctuation fixes
Index: wikisrc/Installation_on_UEFI_systems.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Installation_on_UEFI_systems.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/Installation_on_UEFI_systems.mdwn	12 Jun 2018 11:06:18 -0000	1.1
+++ wikisrc/Installation_on_UEFI_systems.mdwn	13 Jun 2018 07:30:36 -0000	1.2
@@ -33,7 +33,7 @@
         # sysctl hw.disknames
         hw.disknames = wd0 dk0 dk1 dk2 dk3 sd0 dk4 dk5
 
-Here the internal SSD is showing up as wd0, and has Windows pre installed (dk0 .. dk3). The install image USB stick again shows up as sd0 with two wedges dk4 and dk5.
+Here the internal SSD is showing up as wd0, and has Windows pre-installed (dk0 .. dk3). The install image USB stick again shows up as sd0 with two wedges dk4 and dk5.
 
 Just to be sure let us check which device the installer booted from:
 
@@ -68,7 +68,7 @@
         wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA moded 6 (Ultra/133)
         wd0(ahcisata1:0:0): using PIO mode 4, DMA mode 2, Ultra-DMA mode 6 (Ultra/133) (using DMA)
 
-**NOTE** for this tutorial screenshots have been created using VirtualBox. The following example uses a strange tiny 30 GB (virtual) hard disk. Also on VirtualBox it is quite tricky (or impossible?) to actually boot from a USB device - instead the USB install image was converted to a virtual disk image and the machine booted from that. This makes the install image show up as *wd1*.
+**NOTE** for this tutorial screenshots have been created using VirtualBox. The following example uses a strange tiny 30 GB (virtual) hard disk. Also on VirtualBox it is quite tricky (or impossible?) to actually boot from a USB device - instead the USB install image was converted to a virtual disk image, and the machine booted from that. This makes the install image show up as *wd1*.
 
 Here are the target disk details:
 
@@ -78,7 +78,7 @@
 
 So now that we have identified the disk and got the details, we need to plan our disk layout.
 
-We will need two partitions, one for UEFI to boot from, and the NetBSD root disk partition. Depending on planed use for the machine, we also will want a swap partition. This should not be smaller than the machines RAM size, so in case of a kernel panic a crash dump can be saved and recovered on next reboot. For this example let us calculate with 8 GB RAM and no special needs for more swap.
+We will need two partitions, one for UEFI to boot from, and the NetBSD root disk partition. Depending on planned use for the machine, we also will want a swap partition. This should not be smaller than the machine's RAM size, so in case of a kernel panic a crash dump can be saved and recovered on next reboot. For this example let us calculate with 8 GB RAM and no special needs for more swap.
 
 So we have a 30 GB disk, we subtract 8 GB of swap and a bit of space for the UEFI boot partition. That leaves us with (rounded down) 21 GB of space for the main NetBSD partition.
 
@@ -97,7 +97,7 @@
         # gpt add -a 2m -l NetBSD -t ffs -s 21g wd0
         # gpt add -a 2m -l swap -t swap wd0
 
-Then we check the result
+Then we check the result:
 
         # gpt show wd0
 

Initial version of UEFI install instructions
--- /dev/null	2018-06-12 11:06:04.000000000 +0000
+++ wikisrc/Installation_on_UEFI_systems.mdwn	2018-06-12 11:06:34.000000000 +0000
@@ -0,0 +1,153 @@
+## Installing NetBSD 8.0 on a x86 system with UEFI
+
+Modern x86 machines have UEFI instead of BIOS firmware. Unfortunately, as of the upcoming NetBSD 8.0 release the installer does not fully support this setup. We hope to address this shortcoming quickly after the NetBSD 8.0 release and provide full automatic installations for this kind of systems (and also mixed operating system setups) in NetBSD 8.1.
+
+This tutorial shows how to semi-manually do it. For simplicity we assume that you have booted the UEFI install image from a USB stick and want to install NetBSD onto the whole disk in the machine.
+
+### Getting out of the Installer
+
+The install image will offer a menu item to exit the install system. Using that will drop you to a shell prompt.
+
+![screenshot of sysinst main menu](https://netbsd.org/images/misc/uefi/01_exit_installer.png "Exit the Installer")
+
+### Identifying Disks
+
+At the shell prompt let us find out what disks we have and which one we want to install to. We can find out what disk devices have been recognized by the kernel via the sysctl program:
+
+        # sysctl hw.disknames
+        hw.disknames = ld0 wd0 cd0 sd0 dk0 dk1
+
+This output is from a typical desktop machine. Depending on details a SSD will show up as *ld* (NVME device) or *wd* (SATA device). Hard disks usually show up as *wd* as well. Other disks may show up as *ld* or *sd* (SCSI, SAN, RAID, ...). USB sticks typically show up as *sd* devices.
+
+So here we have a SSD as ld0, a hard disk as wd0, a blueray drive as cd0, and the install image on USB stick as sd0.
+
+The *dk* devices are logical wedges (partitions) on the hardware devices, and this early after boot we usually see them in order, that is: dk0 and dk1 are partitions on the installer USB stick sd0. We can verify that by asking for a list of wedges on sd0:
+
+        # dkctl sd0 listwedges
+        /dev/rsd0: 2 wedges:
+        dk0: EFI system, 262144 blocks at 2048, type: msdos
+        dk1: 2dfc926e-42bd-43fb-9bb5-b227c2c3fc99, 2560000 blocks at 264192, type: ffs
+
+Let us look at another example, this time from a typical notebook:
+
+        # sysctl hw.disknames
+        hw.disknames = wd0 dk0 dk1 dk2 dk3 sd0 dk4 dk5
+
+Here the internal SSD is showing up as wd0, and has Windows pre installed (dk0 .. dk3). The install image USB stick again shows up as sd0 with two wedges dk4 and dk5.
+
+Just to be sure let us check which device the installer booted from:
+
+        # dmesg | fgrep "root on"
+        root on dk5
+
+and verify this is indeed on sd0:
+
+        # dkctl sd0 listwedges
+        /dev/rsd0: 2 wedges:
+        dk4: EFI system, 262144 blocks at 2048, type: msdos
+        dk5: 2dfc926e-42bd-43fb-9bb5-b227c2c3fc99, 2560000 blocks at 264192, type: ffs
+
+Now for fun check the internal ssd:
+
+        # dkctl wd0 listwedges
+        /dev/rwd0: 4 wedges:
+        dk0: EFI system partition, 204800 blocks at 2048, type: msdos
+        dk1: Microsoft reserved partition, 32768 blocks at 206848, type:
+        dk2: Basic data partition, 409602048 blocks at 239616, type:
+        dk3: 2d02bc12-8433-4e41-ac12-f89167b1a93e, 1024000 blocks at 499093504, type:
+
+**NOTE**: if you keep following this tutorial on a machine like the above, the windows installation will be destroyed and all data lost!
+
+You can check more details about individual disks by extracting parts of the kernel output from the dmesg output. Assuming we want to install onto disk wd0, let us check for it:
+
+        # dmesg | fgrep wd0
+        wd0 at atabus4 drive 0
+        wd0: <WDC WD4002FFWX-68TZ4N0>
+        wd0: drive supports 16-sector PIO transfers, LBA48 addressing
+        wd0: 3726 GB, 7752021 cyl, 16 head, 63 sec, 512 bytes/sect x 7814037168 sectors
+        wd0: drive supports PIO mode 4, DMA mode 2, Ultra-DMA moded 6 (Ultra/133)
+        wd0(ahcisata1:0:0): using PIO mode 4, DMA mode 2, Ultra-DMA mode 6 (Ultra/133) (using DMA)
+
+**NOTE** for this tutorial screenshots have been created using VirtualBox. The following example uses a strange tiny 30 GB (virtual) hard disk. Also on VirtualBox it is quite tricky (or impossible?) to actually boot from a USB device - instead the USB install image was converted to a virtual disk image and the machine booted from that. This makes the install image show up as *wd1*.
+
+Here are the target disk details:
+
+![screenshot of wd0 dmesg details](https://netbsd.org/images/misc/uefi/02_hard_disk_details.png "Disk Details")
+
+### Size Calculations
+
+So now that we have identified the disk and got the details, we need to plan our disk layout.
+
+We will need two partitions, one for UEFI to boot from, and the NetBSD root disk partition. Depending on planed use for the machine, we also will want a swap partition. This should not be smaller than the machines RAM size, so in case of a kernel panic a crash dump can be saved and recovered on next reboot. For this example let us calculate with 8 GB RAM and no special needs for more swap.
+
+So we have a 30 GB disk, we subtract 8 GB of swap and a bit of space for the UEFI boot partition. That leaves us with (rounded down) 21 GB of space for the main NetBSD partition.
+
+### Partitioning and Formating the Disk
+
+**NOTE** we are about to fully destroy all contents on this disk! Please stop if you are unsure or have no proper backup!
+
+Just to make sure, we kill any old partition data on the disk:
+
+        # gpt destroy wd0
+
+Next we create a new partition table and add the partitions with the sizes calculated above (the EFI partition usually is quite small):
+
+        # gpt create wd0
+        # gpt add -a 2m -l "EFI system" -t efi -s 128m wd0
+        # gpt add -a 2m -l NetBSD -t ffs -s 21g wd0
+        # gpt add -a 2m -l swap -t swap wd0
+
+Then we check the result
+
+        # gpt show wd0
+
+Note that the kernel messages between the commands also show us the wedge names (dk0...dk4) of the individual partitions we have just created. The mapping between partitions on a disk and wedge (dk) devices is not fixed, you can see below that managing partitions removes all old wedge devices and adds new ones.
+
+![screenshot of wd0 partitioning](https://netbsd.org/images/misc/uefi/03_create_gpt.png "Partitioning the Disk")
+
+Just to make double sure, let us list the wedges on wd0 explicitly:
+
+        # dkctl wd0 listwedges
+
+Now we need to format the EFI partition as type msdos, and the NetBSD partition as type ffs. Also we create a directory "EFI/boot" on the EFI partition and copy the bootloaders there.
+
+The commands for this are:
+
+        # newfs_msdos /dev/rdk2
+        # mount -t msdos /dev/dk2 /mnt
+        # mkdir -p /mnt/EFI/boot
+        # cp /usr/mdec/*.efi /mnt/EFI/boot
+        # umount /mnt
+        # newfs -O 2 dk3
+
+and it looks like this:
+
+![screenshot of wd0 formatting](https://netbsd.org/images/misc/uefi/04_manual_init.png "Formatting the Disk")
+
+### Main Installation
+
+Now we are mostly done. We can leave the shell and return to the installer (sysinst). Type Ctrl-D or use the "exit" command.
+
+Back in sysinst we choose "Install NetBSD to hard disk":
+
+![screenshot of sysinst](https://netbsd.org/images/misc/uefi/05_back_in_sysinst_install.png "Back in Sysinst")
+
+The next steps are mostly the same as for other sysinst installations. We have to confirm (but actually all harm is already done as we manually repartitioned the disk above):
+
+![screenshot of sysinst asking for install confirmation](https://netbsd.org/images/misc/uefi/06_yes_i_mean_it.png "Are we sure?")
+
+Since we already prepared everything, we can select a preformatted wedge (which we did name "NetBSD" above):
+
+![screenshot of sysinst selecting the target disk](https://netbsd.org/images/misc/uefi/07_select_target_wedge.png "Select the target wedge")
+
+*NOTE* if you paid close attention, you will notice a bug in this screenshot. The dk1@wd1 wedge (right above the real target) would be dk1@sd0 on real hardware. That is: this is the install image root partition, which we currently have mounted. Sysinst should not offer this wedge here - a bug that might be fixed before the actual 8.0 release (but not in time for this tutorial).
+
+Not quite usefull in this semi-manual setup, but sysinst asks again for confirmation:
+
+![screenshot of sysinst asking for confirmation again](https://netbsd.org/images/misc/uefi/08_go_for_it.png "Are we still sure?")
+
+Sysinst does not know about the EFI boot partition, but it recognizes there is a swap partition on the same disk as the target partition we have selected. It correctly assumes that we will want to use this for swapping and offers to add it to the installed systems swap configuration:
+
+![screenshot of sysinst offering the swap partition](https://netbsd.org/images/misc/uefi/09_use_my_swap.png "Use the swap partition?")
+
+Now just follow the remaining sysinst steps - they are the same as all other x86 NetBSD installations.

Anchor for new UEFI installation page
Index: wikisrc/tutorials.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/tutorials.mdwn	23 Feb 2018 17:29:48 -0000	1.34
+++ wikisrc/tutorials.mdwn	12 Jun 2018 09:19:43 -0000	1.35
@@ -3,6 +3,7 @@
 ## NetBSD setup
 * [[X11]]
 * [[Services]]
+* [[Installation on UEFI systems]]
 
 ## Guide and HOWTOs
 * [[Optical media]]

update dhcpcd version
Index: wikisrc/users/maya/release-notes-8-draft.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/maya/release-notes-8-draft.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/users/maya/release-notes-8-draft.mdwn	8 Jun 2018 10:28:59 -0000	1.17
+++ wikisrc/users/maya/release-notes-8-draft.mdwn	9 Jun 2018 02:05:21 -0000	1.18
@@ -120,5 +120,5 @@
 * mdocml 1.14.1
 * acpica 20170303
 * ntp 4.2.8p11-o
-* dhcpcd 7.0.3
+* dhcpcd 7.0.5b
 * Lua 5.3.4

Some ARM stuff
Index: wikisrc/users/maya/release-notes-8-draft.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/maya/release-notes-8-draft.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/users/maya/release-notes-8-draft.mdwn	8 Jun 2018 10:19:29 -0000	1.16
+++ wikisrc/users/maya/release-notes-8-draft.mdwn	8 Jun 2018 10:28:59 -0000	1.17
@@ -84,9 +84,12 @@
 
 ARM:
 
-* Add support for NVIDIA Tegra K1 SoC.
-* Add support for Allwinner H2+ and H3 SoCs.
-* FDT  
+* arm: Add FDT support.
+* arm: Add driver for ARM Power State Coordination Interface (PSCI).
+* sunxi: Add support for Allwinner A83T, H2+, and H3 SoCs.
+* tegra: Add support for NVIDIA Tegra K1 SoC.
+* omap: Add support for AM335x GPIO.
+* vexpress: Add support for ARM VExpress-A15 (QEMU).
 XXX elaborate
 
 MIPS:

Index: wikisrc/users/maya/release-notes-8-draft.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/maya/release-notes-8-draft.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/users/maya/release-notes-8-draft.mdwn	8 Jun 2018 10:16:58 -0000	1.15
+++ wikisrc/users/maya/release-notes-8-draft.mdwn	8 Jun 2018 10:19:29 -0000	1.16
@@ -84,7 +84,9 @@
 
 ARM:
 
-* awin, FDT  
+* Add support for NVIDIA Tegra K1 SoC.
+* Add support for Allwinner H2+ and H3 SoCs.
+* FDT  
 XXX elaborate
 
 MIPS:

SD/MMC improvements
Index: wikisrc/users/maya/release-notes-8-draft.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/maya/release-notes-8-draft.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/users/maya/release-notes-8-draft.mdwn	20 Apr 2018 12:29:19 -0000	1.14
+++ wikisrc/users/maya/release-notes-8-draft.mdwn	8 Jun 2018 10:16:58 -0000	1.15
@@ -27,6 +27,7 @@
   * NET_MPSAFE kernel option is required to try
   * Only the components listed below are MP-safe for now
 * WAPBL stability and performance improvements
+* SD/MMC: Add support for SD UHS-I and MMC HS200.
 
 Custom:
 

pr-list is no more.
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wikisrc/releng.mdwn	16 May 2018 15:09:57 -0000	1.26
+++ wikisrc/releng.mdwn	5 Jun 2018 20:25:53 -0000	1.27
@@ -26,7 +26,6 @@
   + [NetBSD 7.0.2](http://www.netbsd.org/releases/formal-7/NetBSD-7.0.2.html)
     - CVS branch tag: <code>netbsd-7-0</code>
 * [Current pull-up queue for the netbsd-7 branch](http://releng.netbsd.org/cgi-bin/req-7.cgi)
-* [NetBSD 7 open problem report summary](http://releng.NetBSD.org/pr-list.html)
 
 ### NetBSD 6.x
 

xen: partially catch up to modern situation
Index: wikisrc/ports/xen/howto.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen/howto.mdwn,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- wikisrc/ports/xen/howto.mdwn	15 Dec 2017 16:40:59 -0000	1.141
+++ wikisrc/ports/xen/howto.mdwn	29 May 2018 01:09:16 -0000	1.142
@@ -51,7 +51,7 @@
 and running domUs under it (NetBSD and other), and also running NetBSD
 as a domU in a VPS.
 
-Xen 3.1 in pkgsrc supports "PCI passthrough", which means that
+Xen 3.1 in pkgsrc used to support "PCI passthrough", which means that
 specific PCI devices can be made available to a specific domU instead
 of the dom0.  This can be useful to let a domU run X11, or access some
 network interface or other peripheral.
@@ -121,20 +121,26 @@
 an i386 dom0, if it turns out that an amd64 Xen kernel and an i386
 dom0 is problematic.)
 
-xenkernel45 provides Xen 4.5.  As of 2016-12, security patches were
-released by Xen and applied to pkgsrc.  Xen 4.5 runs on amd64 hardware
-only.  While slightly old, 4.5 has been tested and run by others, so
-it is the conservative choice.
-
-xenkernel46 provides Xen 4.6.  It is new to pkgsrc as of 2016-05.  As
-of 2016-12, security patches were released by Xen and applied to
-pkgsrc.  Xen 4.6 runs on amd64 hardware only For new installations,
-4.6 is probably the appropriate choice and it will likely soon be the
-standard approach.  (If using Ubuntu guests, be sure to have the
-xentools46 from December, 2016).
+xenkernel45 provides Xen 4.5.  Security advisories released in 2018-05
+did not include support for 4.5.  Xen 4.5 and newer runs on amd64
+hardware only.  While slightly old, 4.5 has been tested and run by
+others, so it is a very conservative choice.
+
+xenkernel46 provides Xen 4.6, and was added to pkgsrc as of 2016-05.
+As of 2018-05, security patches were released by Xen and are expected
+to be applied to pkgsrc.  Xen 4.6 runs on amd64 hardware only.  (If
+using Ubuntu guests, be sure to have the xentools46 from December,
+2016).  4.6 is perhaps an old choice, or perhaps the standard
+approach.
+
+Xen 4.7 was released in 2016-06 and is not in pkgsrc.
+
+xenkernel48 provides Xen 4.8, and was added to pkgsrc in 2017-03.  As
+of 2018-05, security patches were released by Xen and are expected to
+be applied to pkgsrc.  4.8 is perhaps the standard choice, or perhaps
+slightly new.
 
-Xen 4.7 (released 2016-06) and 4.8 (released 2016-12) are not yet in
-pkgsrc.
+Xen 4.9 and 4.10 are not in pkgsrc.
 
 See also the [Xen Security Advisory page](http://xenbits.xen.org/xsa/).
 
@@ -168,18 +174,16 @@
 NetBSD
 ------
 
-The netbsd-6, netbsd-7, and -current branches are all reasonable
+The netbsd-7, netbsd-8, and -current branches are all reasonable
 choices, with more or less the same considerations for non-Xen use.
 Therefore, netbsd-7 is recommended as the stable version of the most
-recent release for production use.  In addition, netbsd-7 and -current
-have a important scheduler fix (in November of 2015) affecting
-contention between dom0 and domUs; see
+recent release for production use.  (Note that netbsd-7 (and therefore
+8/current) have a important scheduler fix (in November of 2015)
+affecting contention between dom0 and domUs; see
 https://releng.netbsd.org/cgi-bin/req-7.cgi?show=1040 for a
-description.  For those wanting to learn Xen or without production
-stability concerns, netbsd-7 is still likely most appropriate, but
--current is also a reasonable choice.  (Xen runs ok on netbsd-5, but
-the xentools packages are likely difficult to build, and netbsd-5 is
-not supported.)
+description.)  For production, netbsd-7 is appropriate.  For learning,
+netbsd-8 is appropriate.  For developing Xen, netbsd-current may be
+appropriate.
 
 As of NetBSD 6, a NetBSD domU will support multiple vcpus.  There is
 no SMP support for NetBSD as dom0.  (The dom0 itself doesn't really
@@ -242,10 +246,12 @@
 Recommendation
 --------------
 
-Therefore, this HOWTO recommends running xenkernel45 or xenkernel46,
-xl, the NetBSD 7 stable branch, and to use an amd64 kernel as the
-dom0.  Either the i386PAE or amd64 version of NetBSD may be used as
-domUs.
+Therefore, this HOWTO recommends running xenkernel46, xl, the NetBSD 7
+stable branch, and therefore to use an amd64 kernel as the dom0.
+Either the i386PAE or amd64 version of NetBSD may be used as domUs.
+
+A tentative replacement recommendation is xenkernel48, xl, and NetBSD
+8.
 
 Because bugs are fixed quite often, and because of Xen security
 advisories, it is good to stay up to date with NetBSD (tracking a
@@ -332,6 +338,10 @@
 have to be bigger than the sum of the RAM/disk needs of the dom0 and
 all the domUs.
 
+In 2018-05, trouble booting a dom0 was reported with 256M of RAM: with
+512M it worked reliably.  This does not make sense, but if you see
+"not ELF" after Xen boots, try increasing dom0 RAM.
+
 Styles of dom0 operation
 ------------------------
 
@@ -429,12 +439,12 @@
 Add a line to to /boot.cfg to boot Xen.  See boot.cfg(5) for an
 example.  The basic line is
 
-        menu=Xen:load /netbsd-XEN3_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=256M
+        menu=Xen:load /netbsd-XEN3_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
 
-which specifies that the dom0 should have 256M, leaving the rest to be
+which specifies that the dom0 should have 512M, leaving the rest to be
 allocated for domUs.  To use a serial console, use
 
-        menu=Xen:load /netbsd-XEN3_DOM0.gz;multiboot /xen.gz dom0_mem=256M console=com1 com1=9600,8n1
+        menu=Xen:load /netbsd-XEN3_DOM0.gz;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
 
 which will use the first serial port for Xen (which counts starting
 from 1, unlike NetBSD which counts starting from 0), forcing
@@ -602,8 +612,8 @@
         # Install secondary boot loader
         cp -p /usr/mdec/boot /
         # Create boot.cfg following earlier guidance:
-        menu=Xen:load /netbsd-XEN3PAE_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=256M
-        menu=Xen.ok:load /netbsd-XEN3PAE_DOM0.ok.gz console=pc;multiboot /xen.ok.gz dom0_mem=256M
+        menu=Xen:load /netbsd-XEN3PAE_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
+        menu=Xen.ok:load /netbsd-XEN3PAE_DOM0.ok.gz console=pc;multiboot /xen.ok.gz dom0_mem=512M
         menu=GENERIC:boot
         menu=GENERIC single-user:boot -s
         menu=GENERIC.ok:boot netbsd.ok
@@ -872,7 +882,7 @@
 
 Modern x86 hardware has vast amounts of resources.  However, many
 virtual servers can function just fine on far less.  A system with
-256M of RAM and a 4G disk can be a reasonable choice.  Note that it is
+512M of RAM and a 4G disk can be a reasonable choice.  Note that it is
 far easier to adjust virtual resources than physical ones.  For
 memory, it's just a config file edit and a reboot.  For disk, one can
 create a new file and vnconfig it (or lvm), and then dump/restore,

No lkm.
Index: wikisrc/guide/rc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/rc.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/guide/rc.mdwn	19 Jun 2015 19:18:31 -0000	1.5
+++ wikisrc/guide/rc.mdwn	28 May 2018 01:49:26 -0000	1.6
@@ -20,7 +20,6 @@
  * `/etc/rc`
  * `/etc/rc.conf`
  * `/etc/rc.d/*`
- * `/etc/rc.lkm`
  * `/etc/rc.local`
  * `/etc/rc.shutdown`
  * `/etc/rc.subr`
@@ -55,10 +54,6 @@
 There are some special scripts outside the `rc.d` directory, which are also
 run:
 
- * `/etc/rc.lkm` loads or unloads Loadable Kernel Modules (LKMs). See
-   [[!template id=man name="modload" section="8"]]
-   and `/etc/rc.d/lkm[123]`.
-
  * `/etc/rc.local` is almost the last script called at boot up. This script can
    be edited by the administrator to start local daemons that don't fit the
    rc.d model, or do maintenance that should be done only once at startup.

Make it clear that qemu module is not a kernel module
Index: wikisrc/users/kamil/qemu.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/kamil/qemu.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/kamil/qemu.mdwn	27 May 2018 09:41:46 -0000	1.2
+++ wikisrc/users/kamil/qemu.mdwn	27 May 2018 09:53:16 -0000	1.3
@@ -63,7 +63,7 @@
 guest-agent    | build the QEMU Guest Agent                         | unknown, probably broken
 guest-agent-msi| build guest agent Windows MSI installation package | unknown, probably broken
 pie            | Position Independent Executables                   | should work
-modules        | modules support                                    | unknown, should work
+modules        | QEMU modules support (not kernel modules)          | unknown, should work
 debug-tcg      | TCG debugging (default is disabled)                | should work
 debug-info     | debugging information                              | should work
 sparse         | sparse checker                                     | should work

Change the syntax attempting to improve the presentation of wiki page
Index: wikisrc/users/kamil/qemu.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/kamil/qemu.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/kamil/qemu.mdwn	27 May 2018 09:32:14 -0000	1.1
+++ wikisrc/users/kamil/qemu.mdwn	27 May 2018 09:41:46 -0000	1.2
@@ -141,19 +141,19 @@
 > HQEMU is a retargetable and multi-threaded dynamic binary translator on multicores. It integrates QEMU and LLVM as its building blocks. The translator in the enhanced QEMU acts as a fast translator with low translation overhead. The optimization-intensive LLVM optimizer running on separate threads dynamically improves code for higher performance. With the hybrid QEMU+LLVM approach, HQEMU can achieve low translation overhead and good translated code quality.
 > HQEMU supports process-level emulation and full-system virtualization. It provides translation modes of running the QEMU translator and LLVM optimizer in one process, or running the LLVM optimizer as a stand-alone optimization server (version 0.13.0).
 
-http://itanium.iis.sinica.edu.tw/hqemu/
+[http://itanium.iis.sinica.edu.tw/hqemu/](http://itanium.iis.sinica.edu.tw/hqemu/)
 
 2. DPDK
 
 > DPDK is a set of libraries and drivers for fast packet processing.
 
-https://dpdk.org/
+[https://dpdk.org/](https://dpdk.org/)
 
 3. The ultimate CPU emulator
 
 > Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework. 
 
-https://www.unicorn-engine.org/
+[https://www.unicorn-engine.org/](https://www.unicorn-engine.org/)
 
 ## Prioritized tasks
 
@@ -198,12 +198,14 @@
  - The module builds and loads into the kernel (triggering a panic)
  - Revisit the UVM APIs to ship all the needed features of sharing memory between user and kernel that is used by HAXM
 
-```
-https://github.com/krytarowski/haxm/tree/netbsd-1
+> https://github.com/krytarowski/haxm/tree/netbsd-1
+> 
+> $ cd netbsd && make
 
-$ cd netbsd && make
-```
+External links:
 
-https://www.qemu.org/2017/11/22/haxm-usage-windows/
-https://software.intel.com/en-us/articles/intel-hardware-accelerated-execution-manager-intel-haxm
-https://github.com/intel/haxm
+[https://www.qemu.org/2017/11/22/haxm-usage-windows/](https://www.qemu.org/2017/11/22/haxm-usage-windows/)
+
+[https://software.intel.com/en-us/articles/intel-hardware-accelerated-execution-manager-intel-haxm](https://software.intel.com/en-us/articles/intel-hardware-accelerated-execution-manager-intel-haxm)
+
+[https://github.com/intel/haxm](https://github.com/intel/haxm)

Introduce a new file with the QEMU/NetBSD status
Cover basic, optional and external features.
Add notes about prioritized tasks.
Add a section about HAXM.
Add notes about prioritized tasks.

Add a section about HAXM.

Members: 
	users/kamil/qemu.mdwn:INITIAL->1.1 

--- /dev/null	2018-05-27 09:32:00.000000000 +0000
+++ wikisrc/users/kamil/qemu.mdwn	2018-05-27 09:32:29.000000000 +0000
@@ -0,0 +1,209 @@
+QEMU for NetBSD
+
+# Current status
+
+Summary of the current status of QEMU hosted on a NetBSD host.
+
+## What works?
+
+Quick summary:
+
+ - The NetBSD target builds and works out of the box with elementary features.
+
+ - There is a pkgsrc package that ships a recent version.
+
+ - QEMU should work with all currently supported NetBSD versions starting from 6.x.
+
+ - QEMU as of today is not PaX MPROTECT safe.
+
+ - All tests in the check target pass.
+
+ - NetBSD is a maintained platform.
+
+## Standard features matrix
+
+Elementary features for NetBSD are probably well supported.
+
+Name                  | Description                                        | NetBSD status
+----------------------|----------------------------------------------------|--------------
+python                | Python programming language                        | should work
+smbd                  | Samba                                              | net/samba, untested
+git                   | GIT VCS                                            | should work
+debug                 |                                                    | should work
+sanitizers            | ASan, UBSan, ASan headers                          | should work
+sanitizers Fibers     | Asan headers with fibers                           | Futue GCC/Clang should work
+stack-protector       | Stack protector                                    | works
+audio oss             | OSS audio backend                                  | should work
+audio sdl             | SDL audio backend                                  | should work
+coroutine ucontext    |                                                    | should work
+coroutine sigaltstack |                                                    | should work
+coroutine windows     |                                                    | N/A, Windows specific
+slirp                 | User networking                                    | works                     
+tcg-interpreter       | Tiny Code Generator                                | should work
+malloc-trim           | GNU malloc(3) optimization                         | N/A, Linux specific
+gcov                  | Test Coverage Program                              | should work
+gprof                 | GNU profiling                                      | should work
+profiler              |                                                    | should work
+
+
+## Optional feature matrix
+
+Additional features support various extensions,
+most of them are a matter of using the emulator with a 3rd party and are OS independent.
+
+Part of features require OS specific extensions.
+
+Name           | Description                                        | NetBSD status
+---------------|----------------------------------------------------|--------------
+system         | all system emulation targets                       | works
+user           | supported user emulation targets                   | broken
+linux-user     | all linux usermode emulation targets               | N/A
+bsd-user       | all BSD usermode emulation targets                 | broken (FreeBSD ships local patches)
+docs           | build documentation                                | should work
+guest-agent    | build the QEMU Guest Agent                         | unknown, probably broken
+guest-agent-msi| build guest agent Windows MSI installation package | unknown, probably broken
+pie            | Position Independent Executables                   | should work
+modules        | modules support                                    | unknown, should work
+debug-tcg      | TCG debugging (default is disabled)                | should work
+debug-info     | debugging information                              | should work
+sparse         | sparse checker                                     | should work
+gnutls         | GNUTLS cryptography support                        | should work
+nettle         | nettle cryptography support                        | should work
+gcrypt         | libgcrypt cryptography support                     | should work
+sdl            | SDL UI                                             | should work
+--with-sdlabi  |   select preferred SDL ABI 1.2 or 2.0              | should work, not imporant
+gtk            | gtk UI                                             | should work
+--with-gtkabi  |   select preferred GTK ABI 2.0 or 3.0              | should work, not important
+vte            | vte support for the gtk UI                         | should work
+curses         | curses UI                                          | works with native NetBSD 8.0 curses(3) 
+vnc            | VNC UI support                                     | should work
+vnc-sasl       | SASL encryption for VNC server                     | should work
+vnc-jpeg       | JPEG lossy compression for VNC server              | should work
+vnc-png        | PNG compression for VNC server                     | should work
+cocoa          | Cocoa UI (Mac OS X only)                           | N/A, Darwin specific
+virtfs         | VirtFS                                             | probably broken
+mpath          | Multipath persistent reservation passthrough       | unknown, problably not supported
+xen            | xen backend driver support                         | unknown
+xen-pci-passthrough |   PCI passthrough support for Xen             | unknown, probably not supported
+brlapi         | BrlAPI (Braile)                                    | unknown, should work
+curl           | curl connectivity                                  | should work
+membarrier     | membarrier system call (for Linux 4.14+ or Windows)| not supported
+fdt            | fdt device tree                                    | unknown, should work
+bluez          | bluez stack connectivity                           | unknown
+kvm            | KVM acceleration support                           | N/A , Linux specific kernel APIs required in userland
+hax            | HAX acceleration support                           | not ported, Windows/Darwin specific as of today
+hvf            | Hypervisor.framework acceleration support          | not ported, Darwin specific
+whpx           | Windows Hypervisor Platform acceleration support   | N/A
+rdma           | Enable RDMA-based migration and PVRDMA support     | unknown, probably not supported
+vde            | support for vde network                            | probably not supported and Linux specific as of today
+netmap         | support for netmap network                         | not supported (FreeBSD specific?)
+linux-aio      | Linux AIO support                                  | not supported, Linux specific
+cap-ng         | libcap-ng support                                  | not supported, Linux specific
+attr           | attr and xattr support                             | N/A, Linux specific ?
+vhost-net      | vhost-net acceleration support                     | not supported
+vhost-crypto   | vhost-crypto acceleration support                  | not supported
+spice          | spice                                              | unknown, probably not supported
+rbd            | rados block device (rbd)                           | unknown
+libiscsi       | iscsi support                                      | unknown
+libnfs         | nfs support                                        | unknown
+smartcard      | smartcard support (libcacard)                      | unknown
+libusb         | libusb (for usb passthrough)                       | unknown
+live-block-migration |  Block migration in the main migration stream| unknown
+usb-redir      | usb network redirection support                    | unknown
+lzo            | support of lzo compression library                 | should work
+snappy         | support of snappy compression library              | should work
+bzip2          | support of bzip2 compression library               | should work
+seccomp        | seccomp support                                    | Linux specific (?)
+coroutine-pool | coroutine freelist (better performance)            | unknown
+glusterfs      | GlusterFS backend                                  | unknown
+tpm            | TPM support                                        | unknown
+libssh2        | ssh block device support                           | should work
+numa           | libnuma support                                    | not ported
+libxml2        | for Parallels image format                         | should work
+tcmalloc       | tcmalloc support                                   | should work
+jemalloc       | jemalloc support                                   | works
+replication    | replication support                                | not ported, N/A ?, Linux specific
+vhost-vsock    | virtio sockets device support                      | not ported
+opengl         | opengl support                                     | unknown
+virglrenderer  | virgl rendering support                            | unknown
+xfsctl         | xfsctl support                                     | N/A / not ported
+qom-cast-debug | cast debugging support                             | unknown
+tools          | build qemu-io, qemu-nbd and qemu-image tools       | works (userland nbd only)
+vxhs           | Veritas HyperScale vDisk backend support           | N/A ?
+crypto-afalg   | Linux AF_ALG crypto backend driver                 | N/A / not ported
+vhost-user     | vhost-user support                                 | not ported
+capstone       | capstone disassembler support                      | should work
+
+## External features
+
+1. HQEMU
+
+> HQEMU is a retargetable and multi-threaded dynamic binary translator on multicores. It integrates QEMU and LLVM as its building blocks. The translator in the enhanced QEMU acts as a fast translator with low translation overhead. The optimization-intensive LLVM optimizer running on separate threads dynamically improves code for higher performance. With the hybrid QEMU+LLVM approach, HQEMU can achieve low translation overhead and good translated code quality.
+> HQEMU supports process-level emulation and full-system virtualization. It provides translation modes of running the QEMU translator and LLVM optimizer in one process, or running the LLVM optimizer as a stand-alone optimization server (version 0.13.0).
+
+http://itanium.iis.sinica.edu.tw/hqemu/
+
+2. DPDK
+
+> DPDK is a set of libraries and drivers for fast packet processing.
+
+https://dpdk.org/
+
+3. The ultimate CPU emulator
+
+> Unicorn is a lightweight multi-platform, multi-architecture CPU emulator framework. 
+
+https://www.unicorn-engine.org/
+
+## Prioritized tasks
+
+1. Upstream remaining local pkgsrc patches, mostly (old?) NetBSD and SmartOS related ones.
+
+2. Make QEMU PaX MPROTECT safe.
+
+3. Develop NetBSD USER emulation, attempt to either share the code with FreeBSD (bsd-user, old broken, downstream patches) or with Linux (linux-user, recent, actively maintained). Preferred approach is to share as much code with linux-user as possible, regardless of the state of bsd-user.
+
+4. Develop HAXM backend support for the NetBSD kernel.
+
+## HAXM hardware assisted virtualization
+
+Features:
+
+ - Open Source
+ - HAXM is an Intel hardware assisted virtualization.
+ - HAXM supports up to 8 active VMs.
+ - HAXM supports up to 16 active VCPUs per VM.
+ - ioctl(2) based API with statically created devices (/dev/HAX, /dev/haxm_vm/vmXX, /dev/haxm_vm/haxm_vmXX_vcpuYY)
+
+HAXM porting for NetBSD rationale:
+
+ - Relatively low cost (compared to alternatives) to get it aboard to the NetBSD kernel.
+ - Relatively non-intrusive (compared to alternatives like bhyve and KVM)
+ - Scratch but non-functional port for NetBSD is ready.
+ - Active (paid developers) upstream to maintain this
+ - Clean separation between kernel specific and independent parts (there are at least 2 backends: Darwin and Windows)
+ - QEMU frontend already exists, API is ioctl(2) based
+ - Good license (BSD-3-clause) for the kernel driver
+ - Tailored down for desktop users, initially prepared for Android developers
+
+HAXM shortcomings:
+

(Diff truncated)
removed
--- wikisrc/ports/evbarm/allwinner/comment_10_75070471dc4cf65f5f398908c72a373a._comment	2018-05-24 23:52:27.000000000 +0000
+++ /dev/null	2018-05-24 23:50:01.000000000 +0000
@@ -1,25 +0,0 @@
-[[!comment format=mdwn
- username="https://me.yahoo.com/a/zYNsZqc.lcfZKosC1gopiusGDpab.Q--#c9040"
- nickname="Mr."
- subject=" This should simply matters for those who just want a quick boot."
- date="2016-03-06T02:21:00Z"
- content="""
-This configuration is grossly complicated and adds extra configurations which does not make sense to use all. uEnv.txt? So, here is the simple breakdown for someone who just wants to get a working boot on cubietruck. The config files that come with the download seem made only for odroid with some sloppy config to look like it should work for others. 
-
-1.    gunzip armv7.img.gz
-2.    dd if=u-boot-sunxi-with-spl.bin of=armv7.img bs=1k seek=8 conv=notrunc
-3.    dd if=armv7.img of=/dev/rsd0d bs=1m
-4.    mount -t msdos /dev/sd0e /mnt
-5.    cd /mnt
-6.    mkdir old
-7.    mv * old/
-8.    mv old/netbsd-YOURKERNEL.ub ./netbsd.ub
-9.    ---- boot.cmd ----
-10.    setenv bootargs \"root=ld0a console=fb\"
-11.    fatload mmc 0:1 82000000 netbsd.ub; bootm 82000000
-12.    ---- EOF ----
-13.    mkubootimage -A arm -n armv7 -T script boot.cmd boot.scr
-
-Done and bootable now. If the screen goes black after boot, unplug and re-plugin the hdmi cable
-
-"""]]

removed
--- wikisrc/ports/evbarm/allwinner/comment_8_990b15ee77360a52340c57221c14f41f._comment	2018-05-24 23:51:35.000000000 +0000
+++ /dev/null	2018-05-24 23:50:01.000000000 +0000
@@ -1,19 +0,0 @@
-[[!comment format=mdwn
- username="skrll"
- subject="BPI boot"
- date="2016-02-24T08:10:56Z"
- content="""
-I have the following for my BPI
-
-bpi# cat /boot/uEnv.txt                                                        
-bootargs=root=wd0a -v c0nsole=fb fb.margin=60 armv7.dcache=1
-aload_script=fatload mmc 0 0x43000000 bananapi/script.bin;
-aload_kernel=fatload mmc 0 0x48000000 netbsd.ub; bootm 0x48000000;
-uenvcmd=run aload_script aload_kernel
-bpi#
-
-with this version of u-boot:
-U-Boot 2014.04-10693-gf954935 (Aug 06 2014 - 11:18:37) Allwinner Technology
-
-Maybe this explains the boot problems people have seen. Any further problems please send-pr.
-"""]]

removed
--- wikisrc/ports/evbarm/allwinner/comment_7_363f58e23b9df9203bf4bafbfa3dedf7._comment	2018-05-24 23:50:54.000000000 +0000
+++ /dev/null	2018-05-24 23:50:01.000000000 +0000
@@ -1,12 +0,0 @@
-[[!comment format=mdwn
- username="soxxxz@e8c88b529498ba028942e1dd078d9db85b32dcf0"
- nickname="soxxxz"
- subject="failed boot"
- date="2016-02-20T22:48:12Z"
- content="""
-I downloaded armv7.img from official FTP, dd'd u-boot-sunxi-with-spl.bin to it, made boot.cmd as per instructions and connected BPI to a Samsung LED TV via hdmi cable. I see the initial boot, however it fails with a black screen after \"transferring control to NetBSD stage-2 loader (at address 40007800)\". What am I doing wrong?
-
-Here is the picture of boot-up: http://imgur.com/uMNI7ay
-
-I initially thought it was a screen resolution problem, but I tried everything in uEnv.txt without success.
-"""]]

removed
--- wikisrc/ports/evbarm/allwinner/comment_7_f7e0af2d35ad5ec4e8a2897609725f68._comment	2018-05-24 23:50:21.000000000 +0000
+++ /dev/null	2018-05-24 23:50:01.000000000 +0000
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://me.yahoo.com/a/zYNsZqc.lcfZKosC1gopiusGDpab.Q--#c9040"
- nickname="Mr."
- subject="comment 7"
- date="2016-01-22T14:48:53Z"
- content="""
-New sources have multiple kernels listed like netbsd-CUBIETRUCK.ub .  Kernel wouldn't boot until I renamed it to netbsd.ub instead of just pointing to netbsd-CUBIETRUCK.ub.
-"""]]

Editorial nits
Index: wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	24 May 2018 17:37:35 -0000	1.23
+++ wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	24 May 2018 17:38:58 -0000	1.24
@@ -85,7 +85,7 @@
     29141       proc                                                     lwp_exit
 
 
-##  Running hello world 
+## Running hello world 
 
 Put the following into the file hello.d:
     
@@ -138,7 +138,7 @@
 'sleep.d' matched 59268 probes".  Then execute a "sleep 2" in another
 shell.
 
-## Tools included base
+## Tools included in base
 
 Starting with NetBSD-8, on builds where `MKDTRACE=yes` is set, scripts from
 [Brendan Gregg's DTrace toolkit](https://github.com/opendtrace/toolkit/) are installed in base as standard.

Make the dtrace example script that purported to trace the execution
of a sleep operation in the kernel actually do that. Also, don't
print the argument to syscall(), which is a trap frame pointer, as an
integer labeled "fd", because that just doesn't make any sense. Also,
add a section heading.
Index: wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	13 Oct 2017 08:24:18 -0000	1.22
+++ wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	24 May 2018 17:37:35 -0000	1.23
@@ -105,29 +105,38 @@
       0      1                           :BEGIN   Hello world
     
 
-A more complex example that traces the execution of a sleep operation
+## A more complex example
+
+The following script traces the execution of a sleep operation
 in the kernel. Put it in sleep.d:
     
     #pragma D option flowindent
-    
-    fbt::syscall:entry
+
+    syscall::nanosleep:entry
     /execname == "sleep" && guard++ == 0/
     {
             self->traceme = 1;
-            printf("fd: %d", arg0);
     }
-    
-    fbt::syscall:entry /self->traceme/ {}
-    
-    fbt::syscall:return
+
+    fbt:::
+    /self->traceme/
+    {}
+
+    syscall::nanosleep:return
     /self->traceme/
     {
             self->traceme = 0;
             exit(0);
     }
-    
 
-Start the script running (dtrace -s sleep.d) and then execute a "sleep 2" in another shell. 
+Start the script running:
+
+    dtrace -s sleep.d
+
+This will take a while as the script instruments every function in the
+kernel. When it's ready, it will print a message like "dtrace: script
+'sleep.d' matched 59268 probes".  Then execute a "sleep 2" in another
+shell.
 
 ## Tools included base
 

CAN controller is supported
Index: wikisrc/ports/evbarm/allwinner.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/allwinner.mdwn,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- wikisrc/ports/evbarm/allwinner.mdwn	15 May 2018 23:06:29 -0000	1.90
+++ wikisrc/ports/evbarm/allwinner.mdwn	23 May 2018 21:14:50 -0000	1.91
@@ -57,6 +57,7 @@
   </thead>
   <tbody>
     <tr><td>Audio codec</td><td>Yes</td><td>Supported on sun4i, sun5i, sun6i, sun7i, sun8i-h2+, sun8i-h3, sun50i-h5, sun50i-a64</td></tr>
+    <tr><td>CAN controller</td><td>Yes</td><td></td></tr>
     <tr><td>Crypto engine</td><td>-</td><td></td></tr>
     <tr><td>CSI</td><td>-</td><td></td></tr>
     <tr><td>DMA</td><td>Yes</td><td></td></tr>

Add 17h.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 16:31:29 -0000	1.35
+++ wikisrc/security/meltdown_spectre.mdwn	23 May 2018 07:47:07 -0000	1.36
@@ -159,7 +159,7 @@
 
 #### Mitigation F: AMD NONARCH
 
-Available only on AMD families 15h and 16h. It can be dynamically
+Available only on AMD families 15h, 16h and 17h. It can be dynamically
 enabled/disabled by changing the "mitigated" sysctl.
 
 ## External Resources

Cross off uefi countdown being invisible thing. thanks, jakllsch.
Index: wikisrc/releng/netbsd8.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd8.mdwn,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- wikisrc/releng/netbsd8.mdwn	16 May 2018 14:16:25 -0000	1.50
+++ wikisrc/releng/netbsd8.mdwn	22 May 2018 18:24:49 -0000	1.51
@@ -31,7 +31,7 @@
 
 * [[!template id=pr number=53291]]: GPT prevents installation
 
-* [[!template id=pr number=53292]]: uefi boot countdown is invisible
+* ~~[[!template id=pr number=53292]]: uefi boot countdown is invisible~~
 
 * [[!template id=pr number=53294]]: ixg(4) stops receiving pkts /!\
 

Drop VIA, they haven't said a word in six months, that's not serious.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 10:55:21 -0000	1.34
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 16:31:29 -0000	1.35
@@ -11,10 +11,8 @@
 Port		|Vendor/Model	|Spectre (V1)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 amd64		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-amd64		|VIA		|Unknown	|		|		|
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-i386		|VIA		|Unknown	|		|		|
 mips		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS (others)	|Not vulnerable	|		|		|
@@ -40,10 +38,8 @@
 Port		|Vendor/Model	|Spectre (V2)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigB] [MitigD]
 amd64		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
-amd64		|VIA		|Unknown	|		|		|
 i386		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigD]
 i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
-i386		|VIA		|Unknown	|		|		|
 mips		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 mips		|MIPS (others)	|Not vulnerable	|		|		|
@@ -69,10 +65,8 @@
 Port		|Vendor/Model	|Meltdown (V3)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigA]	|Fixed [MitigA]
 amd64		|AMD		|Not vulnerable	|		|		|
-amd64		|VIA		|Unknown	|		|		|
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 i386		|AMD		|Not vulnerable	|		|		|
-i386		|VIA		|Unknown	|		|		|
 mips		|(all)		|Not vulnerable	|		|		|
 ia64		|Intel		|Not vulnerable	|		|		|
 riscv		|(spec)		|Not vulnerable	|		|		|
@@ -94,10 +88,8 @@
 Port		|Vendor/Model	|Spectre (V4)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
 amd64		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
-amd64		|VIA		|Unknown	|		|		|
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
 i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
-i386		|VIA		|Unknown	|		|		|
 arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 arm		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed

Put the port names for arm and mips. No one has tried to determine which
cpu model is associated with which port name on NetBSD, so just put
"arm"/"mips".
Reduce the size of the tabs. The unaffected CPUs fall in the "others"
category.
Add ARM for SpectreV4, four models are affected.
Add ARM for SpectreV4, four models are affected.

Members: 
	security/meltdown_spectre.mdwn:1.33->1.34 

Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 10:29:24 -0000	1.33
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 10:55:21 -0000	1.34
@@ -15,23 +15,23 @@
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 i386		|VIA		|Unknown	|		|		|
-		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|MIPS (others)	|Not vulnerable	|		|		|
+mips		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+mips		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+mips		|MIPS (others)	|Not vulnerable	|		|		|
 ia64		|Intel		|Not vulnerable	|		|		|
-riscv		|(Spec.)	|Not vulnerable	|		|		|
-		|ARM Cortex-R7	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-R8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A9	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A12	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A15	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A17	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM (others)	|Not vulnerable	|		|		|
+riscv		|(spec)		|Not vulnerable	|		|		|
+arm		|ARM Cortex-R7	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-R8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A9	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A12	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A15	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A17	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM (others)	|Not vulnerable	|		|		|
 """]]
 
 ## Spectre Variant 2
@@ -44,23 +44,23 @@
 i386		|Intel		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigD]
 i386		|AMD		|Vulnerable	|Not fixed	|Fixed [MitigD]	|Fixed [MitigC] [MitigD]
 i386		|VIA		|Unknown	|		|		|
-		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|MIPS (others)	|Not vulnerable	|		|		|
+mips		|MIPS P5600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+mips		|MIPS P6600	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+mips		|MIPS (others)	|Not vulnerable	|		|		|
 ia64		|Intel		|Not vulnerable	|		|		|
-riscv		|(Spec.)	|Not vulnerable	|		|		|
-		|ARM Cortex-R7	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-R8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A9	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A12	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A15	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A17	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM (others)	|Not vulnerable	|		|		|
+riscv		|(spec)		|Not vulnerable	|		|		|
+arm		|ARM Cortex-R7	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-R8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A8	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A9	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A12	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A15	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A17	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM (others)	|Not vulnerable	|		|		|
 """]]
 
 ## Meltdown
@@ -73,23 +73,14 @@
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Not fixed
 i386		|AMD		|Not vulnerable	|		|		|
 i386		|VIA		|Unknown	|		|		|
-		|MIPS P5600	|Not vulnerable	|		|		|
-		|MIPS P6600	|Not vulnerable	|		|		|
-		|MIPS (others)	|Not vulnerable	|		|		|
+mips		|(all)		|Not vulnerable	|		|		|
 ia64		|Intel		|Not vulnerable	|		|		|
-riscv		|(Spec.)	|Not vulnerable	|		|		|
-		|ARM Cortex-R7	|Not vulnerable	|		|		|
-		|ARM Cortex-R8	|Not vulnerable	|		|		|
-		|ARM Cortex-A8	|Not vulnerable	|		|		|
-		|ARM Cortex-A9	|Not vulnerable	|		|		|
-		|ARM Cortex-A12	|Not vulnerable	|		|		|
-		|ARM Cortex-A15	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A17	|Not vulnerable	|		|		|
-		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM Cortex-A73	|Not vulnerable	|		|		|
-		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
-		|ARM (others)	|Not vulnerable	|		|		|
+riscv		|(spec)		|Not vulnerable	|		|		|
+arm		|ARM Cortex-A15	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM (others)	|Not vulnerable	|		|		|
 """]]
 
 ## Spectre Variant 3a
@@ -107,6 +98,11 @@
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
 i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
 i386		|VIA		|Unknown	|		|		|
+arm		|ARM Cortex-A57	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A72	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A73	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM Cortex-A75	|Vulnerable	|Not fixed	|Not fixed	|Not fixed
+arm		|ARM (others)	|Not vulnerable	|		|		|
 """]]
 
 ## Mitigations

Improve wording.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 10:26:00 -0000	1.32
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 10:29:24 -0000	1.33
@@ -166,8 +166,8 @@
 
 #### Mitigation E: Intel SSBD
 
-Available on Intel only for now. It can be dynamically enabled/disabled by
-changing the "mitigated" sysctl.
+Available only on Intel (for now). It can be dynamically enabled/disabled
+by changing the "mitigated" sysctl.
 
 #### Mitigation F: AMD NONARCH
 

Mention the SpectreV4 mitigation for AMD families 15h and 16h.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 08:24:53 -0000	1.31
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 10:26:00 -0000	1.32
@@ -102,10 +102,10 @@
 [[!table data="""
 Port		|Vendor/Model	|Spectre (V4)	|NetBSD-7	|NetBSD-8	|NetBSD-current
 amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-amd64		|AMD		|Unknown	|		|		|
+amd64		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
 amd64		|VIA		|Unknown	|		|		|
 i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
-i386		|AMD		|Unknown	|		|		|
+i386		|AMD		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigF]
 i386		|VIA		|Unknown	|		|		|
 """]]
 
@@ -126,10 +126,10 @@
 [[!template id=programlisting text="""
 machdep.spectre_v2.hwmitigated = {0/1} user-settable
 machdep.spectre_v2.swmitigated = {0/1} set by the kernel
-machdep.spectre_v2.method = {string} set by the kernel
+machdep.spectre_v2.method = {string} constructed by the kernel
 """]]
 
-Only hwmitigated can be set by the user. When set to one, the kernel will
+Only "hwmitigated" can be set by the user. When set to one, the kernel will
 determine the best hardware mitigation available for the currently
 running CPU, and will apply it.
 
@@ -150,11 +150,29 @@
 Software mitigation. It is enabled by default in GENERIC. When enabled,
 the "swmitigated" sysctl is set to one.
 
-### Mitigation E: Intel SSBD
+### Mitigations E, F
 
-SpectreV4 can be mitigated with the SSBD method (Intel only for now). It
-can be dynamically enabled by changing the "machdep.spectre_v4.mitigated"
-sysctl.
+There are two available mitigations for SpectreV4. Their availability
+depends on the CPU model and the microcode or BIOS revision.
+
+[[!template id=programlisting text="""
+machdep.spectre_v4.mitigated = {0/1} user-settable
+machdep.spectre_v4.method = {string} constructed by the kernel
+"""]]
+
+Only "mitigated" can be set by the user. When set to one, the kernel will
+determine the best hardware mitigation available for the currently
+running CPU, and will apply it.
+
+#### Mitigation E: Intel SSBD
+
+Available on Intel only for now. It can be dynamically enabled/disabled by
+changing the "mitigated" sysctl.
+
+#### Mitigation F: AMD NONARCH
+
+Available only on AMD families 15h and 16h. It can be dynamically
+enabled/disabled by changing the "mitigated" sysctl.
 
 ## External Resources
 

Clarify SpectreV2, and fix the description of SpectreV3a.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 07:37:22 -0000	1.30
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 08:24:53 -0000	1.31
@@ -94,8 +94,8 @@
 
 ## Spectre Variant 3a
 
-This issue will be addressed in future microcode updates. No software
-change is required.
+This issue will be addressed in future microcode updates on x86. No
+software change is required.
 
 ## Spectre Variant 4
 
@@ -116,24 +116,39 @@
 Meltdown is mitigated with the SVS feature. It can be dynamically disabled
 by changing the "machdep.svs.enabled" sysctl.
 
-### Mitigation B: Intel IBRS
+### Mitigations B, C, D
 
-SpectreV2 can be mitigated with the IBRS method (Intel only for now). If
-the CPU supports this method, it is used automatically. It can be
-dynamically disabled by changing the "machdep.spectre_v2.mitigated"
-sysctl.
+There is no unified mitigation for SpectreV2. Rather, a set of mitigations
+are available, in both hardware and software.
+
+Three sysctls exist, under the machdep.spectre_v2 node:
+
+[[!template id=programlisting text="""
+machdep.spectre_v2.hwmitigated = {0/1} user-settable
+machdep.spectre_v2.swmitigated = {0/1} set by the kernel
+machdep.spectre_v2.method = {string} set by the kernel
+"""]]
+
+Only hwmitigated can be set by the user. When set to one, the kernel will
+determine the best hardware mitigation available for the currently
+running CPU, and will apply it.
+
+#### Mitigation B: Intel IBRS
+
+Hardware mitigation, Intel only (for now). If the CPU supports this method,
+it is used automatically by the kernel. It can be dynamically
+enabled/disabled by changing the "hwmitigated" sysctl.
 
-### Mitigation C: AMD DIS_IND
+#### Mitigation C: AMD DIS_IND
 
-SpectreV2 can be mitigated with the DIS_IND method, available only on a
-few AMD families. If the CPU supports this method, it is used
-automatically. It can be dynamically disabled by changing the
-"machdep.spectre_v2.mitigated" sysctl.
+Hardware mitigation, available only on a few AMD families. If the CPU
+supports this method, it is used automatically by the kernel. It can be
+dynamically enabled/disabled by changing the "hwmitigated" sysctl.
 
-### Mitigation D: Retpoline
+#### Mitigation D: GCC Retpoline
 
-SpectreV2 is mitigated in the kernel with the GCC "retpoline" compilation
-flag, which is enabled by default in GENERIC.
+Software mitigation. It is enabled by default in GENERIC. When enabled,
+the "swmitigated" sysctl is set to one.
 
 ### Mitigation E: Intel SSBD
 

Mention SpectreV3a.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wikisrc/security/meltdown_spectre.mdwn	22 May 2018 07:27:25 -0000	1.29
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 07:37:22 -0000	1.30
@@ -92,6 +92,11 @@
 		|ARM (others)	|Not vulnerable	|		|		|
 """]]
 
+## Spectre Variant 3a
+
+This issue will be addressed in future microcode updates. No software
+change is required.
+
 ## Spectre Variant 4
 
 [[!table data="""

Add Spectre Variant 4.
Index: wikisrc/security/meltdown_spectre.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/security/meltdown_spectre.mdwn,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/security/meltdown_spectre.mdwn	4 May 2018 07:34:51 -0000	1.28
+++ wikisrc/security/meltdown_spectre.mdwn	22 May 2018 07:27:25 -0000	1.29
@@ -92,6 +92,18 @@
 		|ARM (others)	|Not vulnerable	|		|		|
 """]]
 
+## Spectre Variant 4
+
+[[!table data="""
+Port		|Vendor/Model	|Spectre (V4)	|NetBSD-7	|NetBSD-8	|NetBSD-current
+amd64		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
+amd64		|AMD		|Unknown	|		|		|
+amd64		|VIA		|Unknown	|		|		|
+i386		|Intel		|Vulnerable	|Not fixed	|Not fixed	|Fixed [MitigE]
+i386		|AMD		|Unknown	|		|		|
+i386		|VIA		|Unknown	|		|		|
+"""]]
+
 ## Mitigations
 
 ### Mitigation A: SVS
@@ -118,6 +130,12 @@
 SpectreV2 is mitigated in the kernel with the GCC "retpoline" compilation
 flag, which is enabled by default in GENERIC.
 
+### Mitigation E: Intel SSBD
+
+SpectreV4 can be mitigated with the SSBD method (Intel only for now). It
+can be dynamically enabled by changing the "machdep.spectre_v4.mitigated"
+sysctl.
+
 ## External Resources
 
 * [MIPS Blog Post](https://www.mips.com/blog/mips-response-on-speculative-execution-and-side-channel-vulnerabilities/)

minor spelling mistakes
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wikisrc/releng.mdwn	16 May 2018 13:39:13 -0000	1.25
+++ wikisrc/releng.mdwn	16 May 2018 15:09:57 -0000	1.26
@@ -6,12 +6,12 @@
 
 ## Next Major Release
 
-The next major release will be NetBSD 8.0.  A first release candidate is [availabel](https://blog.netbsd.org/tnf/entry/netbsd_8_0_release_candidate), no final date for the release has been set yet.
+The next major release will be NetBSD 8.0.  A first release candidate is [available](https://blog.netbsd.org/tnf/entry/netbsd_8_0_release_candidate), no final date for the release has been set yet.
 
 * Next release: NetBSD 8.0
   + CVS branch tag: <code>netbsd-8</code>
 
-Please give a look to the [[NetBSD 8.0 pre-release tasklist|netbsd8]] for more
+Please give a look to the [[NetBSD 8.0 pre-release task list|netbsd8]] for more
 information about open issues and progress.
 
 ## Active Major Releases

Add bug bountys and mark show stoppers
Index: wikisrc/releng/netbsd8.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd8.mdwn,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- wikisrc/releng/netbsd8.mdwn	16 May 2018 13:48:50 -0000	1.49
+++ wikisrc/releng/netbsd8.mdwn	16 May 2018 14:16:25 -0000	1.50
@@ -15,24 +15,32 @@
 * ~~[[!template id=pr number=53096]]: netbsd-8 crash on heavy disk I/O~~ (done)
 
 * [[!template id=pr number=53053]]: non-MULTIPROCESSOR hangs building Go (still reproducable with newer go?)  
-  [[!template id=pr number=53173]]: "go test net/http" locks up the machine
+  [[!template id=pr number=53173]]: "go test net/http" locks up the machine (both PRs tied /!\ )
 
-* [[!template id=pr number=53016]]: Clock not stable
+* [[!template id=pr number=53016]]: Clock not stable /!\
 
 * [[!template id=pr number=53017]]: Kernel panics every now and then with "fpusave_lwp: did not" message
 
 * [[!template id=pr number=53143]]: NetBSD 8 panic related to procfs (unclear?)
 
-* [[!template id=pr number=53155]]: Wedge after <12h uptime when >2 bnx network interfaces in use
+* [[!template id=pr number=53155]]: Wedge after <12h uptime when >2 bnx network interfaces in use /!\
 
 * [[!template id=pr number=53161]]: ATF test runs leave a rump_server process around
 
-* [[!template id=pr number=53286]]: hdaudio(4), iwm(4) and rtsx(4) detections fail in UEFI case
+* [[!template id=pr number=53286]]: hdaudio(4), iwm(4) and rtsx(4) detections fail in UEFI case /!\
 
 * [[!template id=pr number=53291]]: GPT prevents installation
 
 * [[!template id=pr number=53292]]: uefi boot countdown is invisible
 
+* [[!template id=pr number=53294]]: ixg(4) stops receiving pkts /!\
+
+## Bug Bountys
+
+PRs in the above list marked with /!\ are show stoppers and have a bug bounty of $100 attached.
+If you find a solution for one of the marked issues that leads to closing of the PRs, we will get
+in touch with you.
+
 ## [Test runs](http://releng.netbsd.org/test-results.html)
 
 * ~~[martin's ARM machine invokes ctfconvert unsuccessfully]~~ (done)

Index: wikisrc/releng/netbsd8.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd8.mdwn,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wikisrc/releng/netbsd8.mdwn	16 Apr 2018 11:22:11 -0000	1.48
+++ wikisrc/releng/netbsd8.mdwn	16 May 2018 13:48:50 -0000	1.49
@@ -14,7 +14,8 @@
 
 * ~~[[!template id=pr number=53096]]: netbsd-8 crash on heavy disk I/O~~ (done)
 
-* [[!template id=pr number=53053]]: non-MULTIPROCESSOR hangs building Go (still reproducable with newer go?)
+* [[!template id=pr number=53053]]: non-MULTIPROCESSOR hangs building Go (still reproducable with newer go?)  
+  [[!template id=pr number=53173]]: "go test net/http" locks up the machine
 
 * [[!template id=pr number=53016]]: Clock not stable
 
@@ -26,6 +27,12 @@
 
 * [[!template id=pr number=53161]]: ATF test runs leave a rump_server process around
 
+* [[!template id=pr number=53286]]: hdaudio(4), iwm(4) and rtsx(4) detections fail in UEFI case
+
+* [[!template id=pr number=53291]]: GPT prevents installation
+
+* [[!template id=pr number=53292]]: uefi boot countdown is invisible
+
 ## [Test runs](http://releng.netbsd.org/test-results.html)
 
 * ~~[martin's ARM machine invokes ctfconvert unsuccessfully]~~ (done)

Belatedly mention the -8 branch and its state
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/releng.mdwn	18 Apr 2018 22:25:50 -0000	1.24
+++ wikisrc/releng.mdwn	16 May 2018 13:39:13 -0000	1.25
@@ -6,12 +6,13 @@
 
 ## Next Major Release
 
-The next major release will be NetBSD 8.0.  There are no dates associated with NetBSD 8.0 yet.
+The next major release will be NetBSD 8.0.  A first release candidate is [availabel](https://blog.netbsd.org/tnf/entry/netbsd_8_0_release_candidate), no final date for the release has been set yet.
 
-Development for NetBSD 8.0 is still occurring on the trunk of the CVS tree.
+* Next release: NetBSD 8.0
+  + CVS branch tag: <code>netbsd-8</code>
 
 Please give a look to the [[NetBSD 8.0 pre-release tasklist|netbsd8]] for more
-information about the 8.0 pre-release tasklist.
+information about open issues and progress.
 
 ## Active Major Releases
 

removed
--- wikisrc/ports/evbarm/allwinner/comment_10_5a9bbbbd96de8dbd51369ebf4fcdd786._comment	2018-05-16 09:50:05.000000000 +0000
+++ /dev/null	2018-05-16 09:50:02.000000000 +0000
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="a.krey@2923c9d60382d5cc88b81ee3e3c8a27491388435"
- nickname="a.krey"
- subject="bananapi console"
- date="2016-01-16T17:46:51Z"
- content="""
-Unfortunately I tried both 'console=fb' and 'setenv console fb', to no avail. I see the (presumably) sunxi boot on HDMI, but after the console switch there are virtual console that react to keypresses, but no login appears on them. The board even appears via DHCP on the network.
-
-I guess I need to find some serial interface to talk to it?
-"""]]

removed
--- wikisrc/ports/evbarm/allwinner/comment_5_d4bf770020f58f128c5152e9a3a391d8._comment	2018-05-16 09:49:32.000000000 +0000
+++ /dev/null	2018-05-16 09:48:00.000000000 +0000
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="perseant@d02ec84b87d74e665bd454c65697ca5da6d387e9"
- nickname="perseant"
- subject="Need console=fb in Banana Pi section"
- date="2016-01-11T22:11:34Z"
- content="""
-It's not obvious that one should add \"console=fb\" to the boot.cmd file when setting up a BPI board.  Other than that these instructions worked perfectly.  Thanks!
-"""]]

Add a comment