Recent changes to this wiki:

add kof BOF
Index: wikisrc/users/jun.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/jun.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/users/jun.mdwn	14 Oct 2020 22:18:07 -0000	1.18
+++ wikisrc/users/jun.mdwn	27 Oct 2020 02:48:33 -0000	1.19
@@ -1,5 +1,12 @@
 [[!meta  title="Jun Ebihara"]]
 
+## Kansai Open Forum 2020 BSD BoF
+- 2020 Nov.7 Sat 15:00-15:50 JST (UTC+9)
+- Join meeting with ZOOM & YoutubeLive
+- https://www.k-of.jp/2020/
+- https://k-of.jp/backend/time_schedule_2
+- https://k-of.jp/backend/session/1374
+
 ## Open Source Confrence 2020 Online/Fall
 - 2020 Oct.24 Sat. 10:00-10:45 JST (UTC+9)
 - NetBSD BoF:

syzbot bugs are important
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/releng/netbsd-10.mdwn	14 Oct 2020 22:22:44 -0000	1.24
+++ wikisrc/releng/netbsd-10.mdwn	25 Oct 2020 19:38:17 -0000	1.25
@@ -21,6 +21,8 @@
 
 ## PRs worth fixing
 
+* **Any issues found by [syzbot](https://syzkaller.appspot.com/netbsd) may potentially crash
+  the kernel and should be investigated and fixed.**
 * [[!template id=pr number=51734]]: hdaudio(4) "RIRB timeout" interrupt storm on boot
 * [[!template id=pr number=52583]]: iwm(4) "unhandled firmware response" followed by panic after extended use
 * [[!template id=pr number=53173]]: "go test net/http" locks up the machine

Added a comment
--- /dev/null	2020-10-22 09:47:03.580156427 +0000
+++ wikisrc/users/rkujawa/notes/comment_1_6172420367e19b52f550d41cd123a664._comment	2020-10-22 09:47:28.467787219 +0000
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="reinoud"
+ subject="comment 1"
+ date="2020-10-22T09:46:57Z"
+ content="""
+The /dev/ttyF* are now creatable with running /etc/MAKEDEV wscons. Further configuration still needs to be done manually and i am not sure how to switch to say ttyF0.
+"""]]

9.1 bits
Index: wikisrc/ports/aarch64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/aarch64.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/ports/aarch64.mdwn	20 Oct 2020 13:42:03 -0000	1.11
+++ wikisrc/ports/aarch64.mdwn	20 Oct 2020 21:26:01 -0000	1.12
@@ -6,6 +6,7 @@
 changes_future="10.0"
 cur_rel="9.1"
 changes_cur="9.1"
+pkg_rel="9.0"
 about="""
 NetBSD/aarch64 is a port to Arm's 64-bit CPUs and other compatible
 machines.
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- wikisrc/ports/evbarm.mdwn	20 Oct 2020 13:42:03 -0000	1.98
+++ wikisrc/ports/evbarm.mdwn	20 Oct 2020 21:26:01 -0000	1.99
@@ -5,7 +5,6 @@
 port_var2="earmv7hf"
 port_var3="earmv7hfeb"
 port_var4="aarch64"
-no_install_notes=YES <!-- XXX update this after 9.1 -->
 port_var_install_notes="evbarm-earm"
 pkg_rel="9.0"
 cur_rel="9.1"

Update for 9.1
Index: wikisrc/ports.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/ports.mdwn	14 Feb 2020 19:15:18 -0000	1.24
+++ wikisrc/ports.mdwn	20 Oct 2020 13:42:03 -0000	1.25
@@ -20,15 +20,15 @@
 
 [[!table data="""
 Port		|CPU		|Machines						|Latest Release
-[[aarch64]]	|aarch64	|64-bit ARM CPUs					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[amd64]]	|x86_64		|64-bit x86-family machines with AMD and Intel CPUs	|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[evbarm]]	|arm		|ARM evaluation boards					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[evbmips]]	|mips		|MIPS-based evaluation boards				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[evbppc]]	|powerpc	|PowerPC-based evaluation boards			|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[hpcarm]]	|arm		|StrongARM based Windows CE PDA machines		|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[i386]]	|i386		|32-bit x86-family generic machines ("PC clones")	|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sparc64]]	|sparc		|Sun UltraSPARC (64-bit)				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[xen]]		|i386, x86_64	|Xen Virtual Machine Monitor				|[9.0](http://www.netbsd.org/releases/formal-9/)
+[[aarch64]]	|aarch64	|64-bit ARM CPUs					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[amd64]]	|x86_64		|64-bit x86-family machines with AMD and Intel CPUs	|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[evbarm]]	|arm		|ARM evaluation boards					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[evbmips]]	|mips		|MIPS-based evaluation boards				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[evbppc]]	|powerpc	|PowerPC-based evaluation boards			|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[hpcarm]]	|arm		|StrongARM based Windows CE PDA machines		|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[i386]]	|i386		|32-bit x86-family generic machines ("PC clones")	|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sparc64]]	|sparc		|Sun UltraSPARC (64-bit)				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[xen]]		|i386, x86_64	|Xen Virtual Machine Monitor				|[9.1](http://www.netbsd.org/releases/formal-9/)
 """]]
 
 
@@ -46,55 +46,55 @@
 [[!table data="""
 Port		|CPU		|Machines								|Latest Release
 [[acorn32]]	|arm		|Acorn RiscPC/A7000/NC and compatibles					|[8.1](http://www.netbsd.org/releases/formal-8/)
-[[algor]]	|mips		|Algorithmics MIPS evaluation boards					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[alpha]]	|alpha		|Digital Alpha (64-bit)							|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[amiga]]	|m68k		|Commodore Amiga, MacroSystem DraCo					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[amigappc]]	|powerpc	|PowerPC-based Amiga boards						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[arc]]		|mips		|Machines following the Advanced RISC Computing spec			|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[atari]]	|m68k		|Atari TT030, Falcon, Hades						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[bebox]]	|powerpc	|Be Inc's BeBox								|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[cats]]	|arm		|Chalice Technology's Strong Arm evaluation board			|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[cesfic]]	|m68k		|CES's FIC8234 VME processor board					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[cobalt]]	|mips		|Cobalt Networks' Microservers						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[dreamcast]]	|[[sh3]]	|Sega Dreamcast game console						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[epoc32]]	|arm		|32bit PSION EPOC PDA							|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[emips]]	|mips		|Machines based on "Extensible MIPS"					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[evbsh3]]	|[[sh3]]	|Evaluation boards with Renesas (Hitachi) Super-H SH3 and SH4 CPUs	|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[ews4800mips]]	|mips		|NEC's MIPS based EWS4800 workstations					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[hp300]]	|m68k		|Hewlett-Packard 9000/300 and 400 series				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[hppa]]	|hppa		|Hewlett-Packard 9000/700 series					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[hpcmips]]	|mips		|MIPS based Windows CE PDA machines					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[hpcsh]]	|[[sh3]]	|Renesas (Hitachi) SH3 and SH4 based Windows CE PDA machines		|[9.0](http://www.netbsd.org/releases/formal-9/)
+[[algor]]	|mips		|Algorithmics MIPS evaluation boards					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[alpha]]	|alpha		|Digital Alpha (64-bit)							|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[amiga]]	|m68k		|Commodore Amiga, MacroSystem DraCo					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[amigappc]]	|powerpc	|PowerPC-based Amiga boards						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[arc]]		|mips		|Machines following the Advanced RISC Computing spec			|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[atari]]	|m68k		|Atari TT030, Falcon, Hades						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[bebox]]	|powerpc	|Be Inc's BeBox								|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[cats]]	|arm		|Chalice Technology's Strong Arm evaluation board			|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[cesfic]]	|m68k		|CES's FIC8234 VME processor board					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[cobalt]]	|mips		|Cobalt Networks' Microservers						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[dreamcast]]	|[[sh3]]	|Sega Dreamcast game console						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[epoc32]]	|arm		|32bit PSION EPOC PDA							|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[emips]]	|mips		|Machines based on "Extensible MIPS"					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[evbsh3]]	|[[sh3]]	|Evaluation boards with Renesas (Hitachi) Super-H SH3 and SH4 CPUs	|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[ews4800mips]]	|mips		|NEC's MIPS based EWS4800 workstations					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[hp300]]	|m68k		|Hewlett-Packard 9000/300 and 400 series				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[hppa]]	|hppa		|Hewlett-Packard 9000/700 series					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[hpcmips]]	|mips		|MIPS based Windows CE PDA machines					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[hpcsh]]	|[[sh3]]	|Renesas (Hitachi) SH3 and SH4 based Windows CE PDA machines		|[9.1](http://www.netbsd.org/releases/formal-9/)
 [[ia64]]	|itanium	|Itanium family of processors						|none
-[[ibmnws]]	|powerpc	|IBM Network Station Series 1000					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[iyonix]]	|arm		|Iyonix ARM pc								|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[landisk]]	|[[sh3]]	|SH4 based NAS appliances by I-O DATA					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[luna68k]]	|m68k		|OMRON Tateisi Electronics' LUNA series					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[mac68k]]	|m68k		|Apple Macintosh							|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[macppc]]	|powerpc	|Apple Power Macintosh and clones					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[mipsco]]	|mips		|Mips family of workstations and servers				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[mmeye]]	|[[sh3]]	|Brains' mmEye Multi Media Server					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[mvme68k]]	|m68k		|Motorola MVME 68k SBCs							|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[mvmeppc]]	|powerpc	|Motorola MVME PowerPC SBCs						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[netwinder]]	|arm		|StrongARM based NetWinder machines					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[news68k]]	|arm		|Sony's m68k based "NET WORK STATION" series				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[newsmips]]	|mips		|Sony's MIPS based "NET WORK STATION" series				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[next68k]]	|m68k		|NeXT 68k 'black' hardware						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[ofppc]]	|powerpc	|Generic OpenFirmware compliant PowerPC machines			|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[pmax]]	|mips		|Digital MIPS-based DECstations and DECsystems				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[prep]]	|powerpc	|PReP (PowerPC Reference Platform) and CHRP machines			|[9.0](http://www.netbsd.org/releases/formal-9/)
+[[ibmnws]]	|powerpc	|IBM Network Station Series 1000					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[iyonix]]	|arm		|Iyonix ARM pc								|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[landisk]]	|[[sh3]]	|SH4 based NAS appliances by I-O DATA					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[luna68k]]	|m68k		|OMRON Tateisi Electronics' LUNA series					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[mac68k]]	|m68k		|Apple Macintosh							|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[macppc]]	|powerpc	|Apple Power Macintosh and clones					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[mipsco]]	|mips		|Mips family of workstations and servers				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[mmeye]]	|[[sh3]]	|Brains' mmEye Multi Media Server					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[mvme68k]]	|m68k		|Motorola MVME 68k SBCs							|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[mvmeppc]]	|powerpc	|Motorola MVME PowerPC SBCs						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[netwinder]]	|arm		|StrongARM based NetWinder machines					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[news68k]]	|arm		|Sony's m68k based "NET WORK STATION" series				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[newsmips]]	|mips		|Sony's MIPS based "NET WORK STATION" series				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[next68k]]	|m68k		|NeXT 68k 'black' hardware						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[ofppc]]	|powerpc	|Generic OpenFirmware compliant PowerPC machines			|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[pmax]]	|mips		|Digital MIPS-based DECstations and DECsystems				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[prep]]	|powerpc	|PReP (PowerPC Reference Platform) and CHRP machines			|[9.1](http://www.netbsd.org/releases/formal-9/)
 [[riscv]]	|riscv		|RISC-V									|none
-[[rs6000]]	|powerpc	|MCA-based IBM RS/6000 workstations					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sandpoint]]	|powerpc	|Motorola Sandpoint reference platform					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sbmips]]	|mips		|Broadcom SiByte evaluation boards					|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sgimips]]	|mips		|Silicon Graphics' MIPS-based workstations				|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[shark]]	|arm		|Digital DNARD ("shark")						|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sparc]]	|sparc		|Sun SPARC (32-bit)							|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sun2]]	|m68k		|Sun 2									|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[sun3]]	|m68k		|Sun 3 and 3x								|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[vax]]		|vax		|Digital VAX								|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[x68k]]	|m68k		|Sharp X680x0 series							|[9.0](http://www.netbsd.org/releases/formal-9/)
-[[zaurus]]	|arm		|Sharp C7x0/C860/C1000/C3x00 series PDA					|[9.0](http://www.netbsd.org/releases/formal-9/)
+[[rs6000]]	|powerpc	|MCA-based IBM RS/6000 workstations					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sandpoint]]	|powerpc	|Motorola Sandpoint reference platform					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sbmips]]	|mips		|Broadcom SiByte evaluation boards					|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sgimips]]	|mips		|Silicon Graphics' MIPS-based workstations				|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[shark]]	|arm		|Digital DNARD ("shark")						|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sparc]]	|sparc		|Sun SPARC (32-bit)							|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sun2]]	|m68k		|Sun 2									|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[sun3]]	|m68k		|Sun 3 and 3x								|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[vax]]		|vax		|Digital VAX								|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[x68k]]	|m68k		|Sharp X680x0 series							|[9.1](http://www.netbsd.org/releases/formal-9/)
+[[zaurus]]	|arm		|Sharp C7x0/C860/C1000/C3x00 series PDA					|[9.1](http://www.netbsd.org/releases/formal-9/)
 """]]
 
 
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/releng.mdwn	11 Oct 2020 10:38:25 -0000	1.43
+++ wikisrc/releng.mdwn	20 Oct 2020 13:42:03 -0000	1.44
@@ -14,7 +14,7 @@
 
 ### NetBSD 9.x
 
-* Next minor release: NetBSD 9.1 (planned release date: October 15)
+* Next minor release: NetBSD 9.2 (no schedule)
   + CVS branch tag: <code>netbsd-9</code>
 * [Current pull-up queue for the netbsd-9 branch](http://releng.netbsd.org/cgi-bin/req-9.cgi)
 
Index: wikisrc/ports/aarch64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/aarch64.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/ports/aarch64.mdwn	23 May 2020 12:43:34 -0000	1.10
+++ wikisrc/ports/aarch64.mdwn	20 Oct 2020 13:42:03 -0000	1.11
@@ -4,8 +4,8 @@
 port_alt="arm"
 future_rel="10.0"
 changes_future="10.0"
-cur_rel="9.0"
-changes_cur="9.0"
+cur_rel="9.1"
+changes_cur="9.1"
 about="""
 NetBSD/aarch64 is a port to Arm's 64-bit CPUs and other compatible
 machines.
Index: wikisrc/ports/algor.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/algor.mdwn,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wikisrc/ports/algor.mdwn	15 Feb 2020 08:00:05 -0000	1.21
+++ wikisrc/ports/algor.mdwn	20 Oct 2020 13:42:03 -0000	1.22
@@ -1,9 +1,9 @@
 [[!template id=port
 port="algor"
-cur_rel="9.0"
+cur_rel="9.1"
 future_rel="10.0"
 pkg_rel="6.0"
-changes_cur="9.0"
+changes_cur="9.1"
 changes_future="10.0"
 thumbnail="//www.netbsd.org/images/ports/algor/alogo2.gif"
 no_install_notes="defined"
Index: wikisrc/ports/alpha.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/alpha.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/ports/alpha.mdwn	15 Feb 2020 08:00:05 -0000	1.20
+++ wikisrc/ports/alpha.mdwn	20 Oct 2020 13:42:03 -0000	1.21

(Diff truncated)
Try to improve markup of inline code citations
Index: wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:27:59 -0000	1.5
+++ wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	17 Oct 2020 17:47:24 -0000	1.6
@@ -18,7 +18,7 @@
 being created (by pure software) using the same physical radio device.
 
  At the user level the radio hardware is hidden quite well - it only
-shows up in dmesg or ``sysctl net.wlan.devices``.
+shows up in `dmesg` or `sysctl net.wlan.devices`.
 There is no network interface for the raw hardware, so ifconfig will
 not show them.
 
@@ -30,7 +30,7 @@
  This split between common radio hardware and per-VAP network properties
 reflects on the driver and causes most of the changes needed.
 
- After creation of the ``wlan0`` VAP, it will also show up under
+ After creation of the `wlan0` VAP, it will also show up under
 
     sysctl net.wlan.wlan0
 
@@ -42,17 +42,15 @@
 
 # Step by Step at the driver level
 
- * The data is split into the generic ``struct ieee80211com``
-   describing the radio hardware (often used as ``ic`` pointer),
+ * The data is split into the generic `struct ieee80211com`
+   describing the radio hardware (often used as `ic` pointer),
    which is part of the drivers softc. The individual VAPs are
    in a TAILQ in the ic structure, and often are a driver defined
-   structure 'derived' from ``struct ieee80211vap`` (with some
+   structure 'derived' from `struct ieee80211vap` (with some
    additional driver specific data). The VAP structure has the
-   network interface ``struct ifnet`` as ``iv_ifp.
-   The ``if_softc`` pointer in
-   the ifnet structure points to the VAP, the VAP structure
-   has a pointer to the ic ``iv_ic``,
-   the ic structure has a ``ic_softc`` pointer to the softc.
+   network interface `struct ifnet` as `iv_ifp`.
+   The `if_softc` pointer in the ifnet structure points to the VAP, the VAP structure
+   has a pointer to the ic `iv_ic`, the ic structure has a `ic_softc` pointer to the softc.
 
  * MAC addresses are now stored in ic_macaddr instead of ic_myaddr
    (in struct ieee80211com). It is typically read from the device
@@ -60,7 +58,7 @@
 
     IEEE80211_ADDR_COPY(ic->ic_macaddr, rom->macaddr);
 
- * In the attach function, no ``struct ifnet ifp`` will be needed,
+ * In the attach function, no `struct ifnet ifp` will be needed,
    so get rid of code like:
 
      struct ifnet *ifp = GET_IFP(sc);
@@ -88,7 +86,7 @@
 
    Note that the way channels are set up has changed.
    If your driver had a driver_init_channels() function, you can
-   use it mostly verbatim. Rename it to ``driver_get_radiocaps`` and
+   use it mostly verbatim. Rename it to `driver_get_radiocaps` and
    make it look like:
 
     ```
@@ -106,11 +104,11 @@
     }
     ```
 
-   and also assign this function to ``ic->ic_getradiocaps`` in
+   and also assign this function to `ic->ic_getradiocaps` in
    the attach function.
 
-   An initial setup must happen before calling ``ieee80211_ifattach(ic)``.
-   You can just call the ``driver_get_radiocaps()`` function during
+   An initial setup must happen before calling `ieee80211_ifattach(ic)`.
+   You can just call the `driver_get_radiocaps()` function during
    attach like:
 
     ```
@@ -122,7 +120,7 @@
     ```
 
  * If your driver used to override state machine functions (typical
-   ``newstate`` to controll LEDs when associating or similar),
+   `newstate` to controll LEDs when associating or similar),
    remove all traces for this from your softc and override a
    custom VAP type instead (i.e. derive a struct from
    struct ieee80211vap and use your own struct in your vap_create
@@ -133,7 +131,7 @@
    newstate function, which now is per VAP and moved into your
    derived per-VAP structure.
 
- * Many functions will get a ``struct ieee80211vap *vap`` passed instead
+ * Many functions will get a `struct ieee80211vap *vap` passed instead
    of a softc. A typical change to adapt for that looks like:
 
     ```
@@ -164,7 +162,7 @@
    This device private send queue (writer: any of the current VAPs
    of this interface, consumer: the devices transmit interrupt handler)
    abuses the mbuf rcvif pointer to store the node pointer
-   ``struct ieee80211_node *`` of the target node for this packet.
+   `struct ieee80211_node *` of the target node for this packet.
    When dequeing a packet before handing it over to the output function,
    the node is extracted and the rcvif pointer set to NULL.
    Yes - this is a hack.
@@ -175,8 +173,8 @@
     ic->ic_name = device_xname(self);
 
    Many drivers query the hardware/firmware for the number of available
-   input / output queues and store these in e.g. ``sc->ntxchains``
-   and ``sc->nrxchains`` or similar variables. This information
+   input / output queues and store these in e.g. `sc->ntxchains`
+   and `sc->nrxchains` or similar variables. This information
    needs to be propagated to the common radio structure:
 
     ```
@@ -188,7 +186,7 @@
 
     ic->ic_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 
-   After calling ``ieee80211_ifattach(ic);`` some methods in ic
+   After calling `ieee80211_ifattach(ic);` some methods in ic
    need to be overwritten. The functions needed are explained
    below, here is a typical setup:
 
@@ -208,7 +206,7 @@
 
 
  * detach does not deal with any interfaces any more, remove all traces
-   of ``struct ifnet *ifp``.
+   of `struct ifnet *ifp`.
 
  * Add a new function for VAP creation and move all interface specific
    setup there. It looks like:
@@ -228,9 +226,9 @@
     }
     ```
 
-   It allocates a new VAP with ``kmem_zalloc`` initializes it
-   by calling ``ieee80211_vap_setup`` for it and then ovverriding whatever
-   the driver needs, passes it to ``ieee80211_vap_attach`` and
+   It allocates a new VAP with `kmem_zalloc` initializes it
+   by calling `ieee80211_vap_setup` for it and then ovverriding whatever
+   the driver needs, passes it to `ieee80211_vap_attach` and
    attaches bpf to the interface.
 
    If your interrupt handler is called in hard interrupt context
@@ -295,27 +293,27 @@
    device.
 
  * The set channel function is generic now, so gets passed a
-   ``struct ieee80211com *ic`` instead of a softc, and sets
+   `struct ieee80211com *ic` instead of a softc, and sets
    the radio hardware to the current channel in that structure,
-   ``ic->ic_curchan``.
+   `ic->ic_curchan`.
 
- * The start function does not need a ``struct ifnet *ifp`` any more,
-   but can use a softc or ``struct ieee80211com *ic`` instead. It is
+ * The start function does not need a `struct ifnet *ifp` any more,
+   but can use a softc or `struct ieee80211com *ic` instead. It is
    supposed to send management frames (from ic->ic_mgtq) first, then
    everything in the device sc_sendq (see above).
 
  * Typicall generic "media change" and "status" functions will
-   be used: ``ieee80211_media_change`` and ``ieee80211_media_status``.
+   be used: `ieee80211_media_change` and `ieee80211_media_status`.
    Old drivers often implement their own function - remove that (unless
    there is something actually chip specific in them).
 
    If there is, override media_change and/or media_status, and make
    sure to call the generic variant for all the real work. Also
-   make sure to pass your override function to ``ieee80211_vap_attach``.
+   make sure to pass your override function to `ieee80211_vap_attach`.
    run(4) is an example of this.
 
    The overriden media_{change,status} functions are the only one
-   in a wlan driver that should get a ``struct ifnet *`` argument
+   in a wlan driver that should get a `struct ifnet *` argument
    passed. Checking for this is a good measurement to know you are
    done with conversion (besides the kernel build failing, of course).
 
@@ -361,16 +359,16 @@
     struct urtwn_softc *sc = ic->ic_softc;
     ```
 
-   The check for encrypting packets often was testing the ``ieee80211_frame`
-   wh->i_fc[1] & IEEE80211_FC1_WE`` before encapsulating the ``mbuf``
-   via ``ieee80211_crypto_encap()``. The check now is for
-   ``wh->i_fc[1] & IEEE80211_FC1_PROTECTED``, since WEP is a thing of the
-   past and there are other protocols. Also the ``ieee80211_crypto_encap``
+   The check for encrypting packets often was testing the `ieee80211_frame'
+   wh->i_fc[1] & IEEE80211_FC1_WE` before encapsulating the `mbuf`
+   via `ieee80211_crypto_encap()`. The check now is for
+   `wh->i_fc[1] & IEEE80211_FC1_PROTECTED`, since WEP is a thing of the

(Diff truncated)
RPI: fix link formatting
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:41:50 -0000	1.139
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:44:01 -0000	1.140
@@ -183,7 +183,7 @@
 Note that generally, a single dtb is loaded.  On NetBSD 9, the dtb
 file for the system is loaded by the bootloader (in flash).
 
-The RPI bootloader looks for a magic string in a trailer after the kernel to determine if it should use DTB support (the new normal) or something called ATAG (apparently the old way).  See https://github.com/raspberrypi/linux/commit/2367d8a42e2717d8d15a39a9085cc2909fae033a#diff-8f088aca645d10d79b594d58db4136f3e09caee077fe373bb08f02f2040900a9 for more information.
+The RPI bootloader looks for a magic string in a trailer after the kernel to determine if it should use DTB support (the new normal) or something called ATAG (apparently the old way).  See [upstream commit introducing DTB trailer](https://github.com/raspberrypi/linux/commit/2367d8a42e2717d8d15a39a9085cc2909fae033a#diff-8f088aca645d10d79b594d58db4136f3e09caee077fe373bb08f02f2040900a9) for more information.
 
 ### Kernel format variants
 

RPI: explain kernel variants
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:35:05 -0000	1.138
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:41:50 -0000	1.139
@@ -185,7 +185,30 @@
 
 The RPI bootloader looks for a magic string in a trailer after the kernel to determine if it should use DTB support (the new normal) or something called ATAG (apparently the old way).  See https://github.com/raspberrypi/linux/commit/2367d8a42e2717d8d15a39a9085cc2909fae033a#diff-8f088aca645d10d79b594d58db4136f3e09caee077fe373bb08f02f2040900a9 for more information.
 
+### Kernel format variants
+
+In netbsd-8, only the ELF and bin variants of RPI2 are built.  The bin version is used.
+
+In netbsd-9 releasedir/binary/kernels, the following 4 versions of GENERIC are produced.  (This might be the same in current.)
+
+#### netbsd-GENERIC.gz
+
+This is regular ELF and not used on RPI.
+
+#### netbsd-GENERIC.bin.gz
+
+It is unclear why this file exists on 9.  It seems to be like img, but without the trailer for DTB; this makes sense for 8.
+
+#### netbsd-GENERIC.img.gz
+
+On NetBSD >=9, the kernel with the .img suffix has the trailer to cause the bootloader to load DTB files.
+
+#### netbsd-GENERIC.ub.gz
+
+This is for u-boot and not used on RPI.
+
 ## Configuring 802.11
+
 After installation, the Ethernet will function as on any other NetBSD system; simply enable dhcpcd or configure a static address.  USB WiFi devices will also function as on any other NetBSD system; in addition to dhcpcd or static, configure and enable wpa_supplicant.
 
 Note that the built-in WiFi in the RPI3 is not yet supported.   USB WiFi interfaces (that work on NetBSD in general) should all work.  In particular, the following are known to work:

RPI: More DTB link
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:29:39 -0000	1.137
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:35:05 -0000	1.138
@@ -178,11 +178,14 @@
 
 https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md
 
+### DTBs
+
 Note that generally, a single dtb is loaded.  On NetBSD 9, the dtb
 file for the system is loaded by the bootloader (in flash).
 
-## Configuring 802.11
+The RPI bootloader looks for a magic string in a trailer after the kernel to determine if it should use DTB support (the new normal) or something called ATAG (apparently the old way).  See https://github.com/raspberrypi/linux/commit/2367d8a42e2717d8d15a39a9085cc2909fae033a#diff-8f088aca645d10d79b594d58db4136f3e09caee077fe373bb08f02f2040900a9 for more information.
 
+## Configuring 802.11
 After installation, the Ethernet will function as on any other NetBSD system; simply enable dhcpcd or configure a static address.  USB WiFi devices will also function as on any other NetBSD system; in addition to dhcpcd or static, configure and enable wpa_supplicant.
 
 Note that the built-in WiFi in the RPI3 is not yet supported.   USB WiFi interfaces (that work on NetBSD in general) should all work.  In particular, the following are known to work:

RPI: enhance dtb/boot
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 20:07:30 -0000	1.136
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	16 Oct 2020 17:29:39 -0000	1.137
@@ -174,6 +174,13 @@
 
  - <https://github.com/ebijun/NetBSD/blob/master/RPI/RPIimage/Image/README>
 
+## Boot Process
+
+https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md
+
+Note that generally, a single dtb is loaded.  On NetBSD 9, the dtb
+file for the system is loaded by the bootloader (in flash).
+
 ## Configuring 802.11
 
 After installation, the Ethernet will function as on any other NetBSD system; simply enable dhcpcd or configure a static address.  USB WiFi devices will also function as on any other NetBSD system; in addition to dhcpcd or static, configure and enable wpa_supplicant.
@@ -218,6 +225,12 @@
 
 ## Updating dtb files
 
+### NetBSD 8
+
+On NetBSD 8, dtb files are not used. (\todo Really?)
+
+### NetBSD 9
+
 (This is harder than it should be.)
 Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/foo.dtb to /boot, and from /mnt/dtb/foo.dtb to /boot/dtb.
 
@@ -227,6 +240,10 @@
 
 \todo Explain how one is supposed to be able to update these from the dtb files in releasedir/binary/kernel, or fix it to have the same structure.
 
+### NetBSD current
+
+When updating, ensure that /boot is mounted and that you unpack the dtb set.
+
 ## Updating the firmware
 
 It is highly likely that running NetBSD from a given branch X with firmware from a branch Y < X will not go well.  It is unclear if firmware from a branch Y > X will work.  It is standard practice to use firmware from the right branch.

RPI: typo
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:58:19 -0000	1.135
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 20:07:30 -0000	1.136
@@ -219,7 +219,7 @@
 ## Updating dtb files
 
 (This is harder than it should be.)
-Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/foo.dtb to /boot, and from /mnt/dtb/foo.dtb to /mnt/dtb.
+Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/foo.dtb to /boot, and from /mnt/dtb/foo.dtb to /boot/dtb.
 
 It seems that some systems, including RPI, require dtb files in /boot, and some expect them in /boot/dtb.
 

RPI: Adjust dtb text
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:56:44 -0000	1.134
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:58:19 -0000	1.135
@@ -221,13 +221,15 @@
 (This is harder than it should be.)
 Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/foo.dtb to /boot, and from /mnt/dtb/foo.dtb to /mnt/dtb.
 
-It seems that some systems, including RPI, require dtb files in /boot, and some expect  them in /boot/dtb.
+It seems that some systems, including RPI, require dtb files in /boot, and some expect them in /boot/dtb.
+
+\todo Explain if you only really need the right one for your system type.
 
 \todo Explain how one is supposed to be able to update these from the dtb files in releasedir/binary/kernel, or fix it to have the same structure.
 
 ## Updating the firmware
 
-It is highly likely that running NetBSD from a given branch X with firmware from a branch Y < X will not go well.  It is unclear if firmware from a branch Y > X will work.   It is standard practice to use firmware from the right branch.
+It is highly likely that running NetBSD from a given branch X with firmware from a branch Y < X will not go well.  It is unclear if firmware from a branch Y > X will work.  It is standard practice to use firmware from the right branch.
 
 A section below describes the process of updating NetBSD's copy of the firmware from upstream, with testing, by NetBSD developers.  This section is about updating a system's firmware from the firmware in a version of NetBSD.
 

RPI: fix markup
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:50:42 -0000	1.133
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:56:44 -0000	1.134
@@ -219,7 +219,7 @@
 ## Updating dtb files
 
 (This is harder than it should be.)
-Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/*.dtb to /boot, and from /mnt/dtb/*.dtb to /mnt/dtb.
+Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/foo.dtb to /boot, and from /mnt/dtb/foo.dtb to /mnt/dtb.
 
 It seems that some systems, including RPI, require dtb files in /boot, and some expect  them in /boot/dtb.
 

RPI: move RPI4 to current/manual
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:44:53 -0000	1.132
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:50:42 -0000	1.133
@@ -51,16 +51,17 @@
    These items do not work in the sense that they simply function after a standard install.  Being listed here implies only that there has been list traffic that implies that after taking a bunch of steps (e.g. new firmware, new dtbs, enabling drivers, applying patches), one can end up with the feature working.  The HOWTO explicitly refrains from describing these steps because they are ephemeral.  However, the fact that list traffic indicates success is possible is a clue that proper support is on the horizon, and that is notable.
 
  - RPI3 and RPI0W builtin WiFi
+ - RPI4
 
 ## What needs documenting if it works
 
+ - (Everything listed in the previous section.)
  - CM1
  - CM3
  - CM3lite
 
 ## What needs work
 
- - RPI4 (as of 2020-01, still does not work in current)
  - USB (host); isochronous transfers.
  - RPI0W Bluetooth Low Energy (probably)
 
@@ -80,11 +81,7 @@
 
 While the evbarm port has "eb" variants (for big-endian mode), the RPI systems do not support eb and these variants will not work.  Systems built for older CPU architectures (earm, earmv4, earmv5) are not expected to work on RPI.
 
-The RPI2-1.2 and RPI3 have an armv8 CPU that supports aarch64 (64-bit
-mode) in addition to aarch32 (regular 32-bit ARM).  This is supported,
-from 9 onwards, by the "aarch64" MACHINE_ARCH of evbarm, also
-available in build.sh via the alias evbarm64.  This is also
-referred to as [[NetBSD/aarch64|aarch64]].
+The RPI2-1.2, RPI3 and RPI4 have an armv8 CPU that supports aarch64 (64-bit mode) in addition to aarch32 (regular 32-bit ARM).  This is supported, from 9 onwards, by the "aarch64" MACHINE_ARCH of evbarm, also available in build.sh via the alias evbarm64.  This is also referred to as [[NetBSD/aarch64|aarch64]].
 
 # Installation
 

RPI: Drop mentions of NetBSD 7 other than history
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:27:27 -0000	1.131
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:44:53 -0000	1.132
@@ -18,7 +18,7 @@
 
 "Works" is primarily relative to the earmv6hf-el and earmv7hf-el CPU targets (32-bit).
 
-## NetBSD 7 and NetBSD 8
+## NetBSD 8
 
  - RPI1, RPI2, RPI2-1.2, RPI3, RPI3+ (except RPI3 builtin WiFi and bluetooth)
  - RPI0 and RPI0W are expected to work (without WiFi, and one needs fdt files \todo where from?)
@@ -119,7 +119,7 @@
 
 ### NetBSD autobuild HTTPS/FTP servers
 
-NetBSD provides nightly builds on [nycdn.netbsd.org](https://nycdn.netbsd.org/pub/NetBSD-daily/).  The next directory level is the branch being built (netbsd-7, netbsd-8, HEAD, and more), plus optionally things like compiler type.  It is followed by date/time, e.g. "HEAD/201811051650Z"; once a build is complete the symlink "latest" is adjusted to point to it.  The next level is "${MACHINE}-${MACHINE_ARCH}", e.g. "evbarm-earmv7hf", and multiple combinations are provided.
+NetBSD provides nightly builds on [nycdn.netbsd.org](https://nycdn.netbsd.org/pub/NetBSD-daily/).  The next directory level is the branch being built (netbsd-8, netbsd-9, HEAD, and more), plus optionally things like compiler type.  It is followed by date/time, e.g. "HEAD/201811051650Z"; once a build is complete the symlink "latest" is adjusted to point to it.  The next level is "${MACHINE}-${MACHINE_ARCH}", e.g. "evbarm-earmv7hf", and multiple combinations are provided.
 
 An example URL, arguably the standard approach for first-time NetBSD/RPI users, is <https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-8/latest/evbarm-earmv7hf/binary/gzimg/>
 
@@ -270,11 +270,11 @@
 
 ## Video playback
 
-Accelerated video playback is supported in NetBSD 7 with the [OMXPlayer](http://pkgsrc.se/multimedia/omxplayer) application and through GStreamer with the [omx](http://pkgsrc.se/multimedia/gst-plugins1-omx) plugin.
+Accelerated video playback is supported with the [OMXPlayer](http://pkgsrc.se/multimedia/omxplayer) application and through GStreamer with the [omx](http://pkgsrc.se/multimedia/gst-plugins1-omx) plugin.
 
 ## OpenGL ES
 
-Accelerated OpenGL ES is supported in NetBSD 7. The GL ES client libraries are included with the [misc/raspberrypi-userland](http://pkgsrc.se/misc/raspberrypi-userland) package.
+Accelerated OpenGL ES is supported.  The GL ES client libraries are included with the [misc/raspberrypi-userland](http://pkgsrc.se/misc/raspberrypi-userland) package.
 
 ## Quake 3
 

RPI: Explain kernel and firmware more
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	5 Sep 2020 12:54:33 -0000	1.130
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	15 Oct 2020 19:27:27 -0000	1.131
@@ -203,23 +203,44 @@
 
 ## Updating the kernel
 
- - Build a new kernel, e.g. using build.sh. It will tell you where the ELF version of the kernel is, e.g.
-
+ - Run uname -a to determine the name of the config of your current kernel.  For NetBSD <= 8, one ran RPI or RPI2.  For NetBSD >=9, one uses GENERIC.
+ - Build a new kernel, e.g. using build.sh. Ideally, run "build.sh release" and look in releasedir/binary/kernels.  If building just a kernel, it will tell you where the ELF version of the kernel is, e.g.
          ...
-         Kernels built from RPI2:
-          /Users/feyrer/work/NetBSD/cvs/src-current/obj.evbarm-Darwin-XXX/sys/arch/evbarm/compile/RPI2/netbsd
+         Kernels built from GENERIC:
+          /Users/feyrer/work/NetBSD/cvs/src-current/obj.evbarm-Darwin-XXX/sys/arch/evbarm/compile/GENERIC/netbsd
          ...
-
- - Besides the "netbsd" kernel in ELF format, there is also a "netbsd.img" (for current) or "netbsd.bin" (for 7 and 8) kernel that is in a format that the Raspberry can boot.
+ - There are multiple kernel formats produced by a release build, for use with different boot loader schemes..  For GENERIC:
+   - netbsd-GENERIC: A normal kernel in ELF format.
+   - netbsd-GENERIC.img: In NetBSD >= 9, formatted for the RPI bootloader.
+   - netbsd-GENERIC.bin: In NetBSD <= 8, formatted for the RPI bootloader.  In NetBSD >= 9, ??????  In NetBSD 9, this kernel WILL NOT boot.
+   - netbsd-GENERIC.ub: A kernel in uboot format.
  - Depending on your hardware version, copy this either to /boot/kernel.img (First generation Pi, Pi Zero hardware) or to /boot/kernel7.img (Pi 2, Pi 3 hardware)
  - reboot
 
 \todo Explain if updating firmware is necessary when e.g. moving from 8 to 9, or 9 to current.
 
+## Updating dtb files
+
+(This is harder than it should be.)
+Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy the dtb files from /mnt/*.dtb to /boot, and from /mnt/dtb/*.dtb to /mnt/dtb.
+
+It seems that some systems, including RPI, require dtb files in /boot, and some expect  them in /boot/dtb.
+
+\todo Explain how one is supposed to be able to update these from the dtb files in releasedir/binary/kernel, or fix it to have the same structure.
+
 ## Updating the firmware
 
+It is highly likely that running NetBSD from a given branch X with firmware from a branch Y < X will not go well.  It is unclear if firmware from a branch Y > X will work.   It is standard practice to use firmware from the right branch.
+
 A section below describes the process of updating NetBSD's copy of the firmware from upstream, with testing, by NetBSD developers.  This section is about updating a system's firmware from the firmware in a version of NetBSD.
 
+(Updating the firmware is harder than it should be.)
+Build a release.  gunzip the armv7.img, vnconfig it, and mount the MSDOS partition (e) e.g. on /mnt.  Copy files from that to /boot that have changes, carefully.
+
+Relevant files include bootcode.bin, start.elf and start_cd.elf.
+
+Compare cmdline.txt, but beware that just overwriting it will lose customizations like using the serial console instead of the framebuffer.
+
 \todo Explain where the firmware is in the source tree, and note that it is not in the installed system image (such as /usr/mdec).  Explain how to update a system (presumably /boot) from either an installed system's new firmware files, or the source tree.  Explain any particular cautions.
 
 \todo Explain if using updated firmware from one branch (e.g. netbsd-current) on a system using a different branch (e.g. netbsd-8) is safe.  Explain if pullups are done to release branches with new firmware.

put the most important stuff first
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/releng/netbsd-10.mdwn	14 Oct 2020 22:18:05 -0000	1.23
+++ wikisrc/releng/netbsd-10.mdwn	14 Oct 2020 22:22:44 -0000	1.24
@@ -1,5 +1,24 @@
 [[!meta title="NetBSD 10.0 preliminary tasklist"]]
 
+## Extra severe Regressions since netbsd-9
+While the PR may be older (so "regression" slightly wrong) new scheduler bugs made it necessary to disable tests to not break whole testbed setups (where in older releases the tests would just fail).
+
+* [[!template id=pr number=49141]]: lib/librumpclient/t_exec/threxec test randomly fails
+* [[!template id=pr number=50350]]: rump/rumpkern/t_sp/stress_{long,short} fail
+* [[!template id=pr number=55304]]: lib/librumpclient/t_exec/threxec, rump/rumpkern/t_sp/reconnect now fail
+* [[!template id=pr number=55356]]: stress_killer test case now fails on real hardware
+* [[!template id=pr number=55338]]: rump threxec test broken
+* [[!template id=pr number=55632]]: tests/net/ipsec/t_ipsec_misc: timeout tests fail randomly
+
+## Regressions since netbsd-9
+
+* ~~[[!template id=pr number=54913]]: fexecve(2) panics in chroot(8)~~
+* [[!template id=pr number=55272]]: userland watchdog processes may be outstalled
+* [[!template id=pr number=55370]]: Invalid modification/connection time with mount_null(8)
+* ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
+* [[!template id=pr number=55509]]: npm install -g electron crashes the kernel
+* ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
+
 ## PRs worth fixing
 
 * [[!template id=pr number=51734]]: hdaudio(4) "RIRB timeout" interrupt storm on boot
@@ -18,25 +37,6 @@
 * [[!template id=pr number=55510]]: pg_jobc going negative and crashing the kernel
 * [[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint
 
-## Regressions since netbsd-9
-
-* ~~[[!template id=pr number=54913]]: fexecve(2) panics in chroot(8)~~
-* [[!template id=pr number=55272]]: userland watchdog processes may be outstalled
-* [[!template id=pr number=55370]]: Invalid modification/connection time with mount_null(8)
-* ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
-* [[!template id=pr number=55509]]: npm install -g electron crashes the kernel
-* ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
-
-## Extra severe Regressions since netbsd-9
-While the PR may be older (so "regression" slightly wrong) new scheduler bugs made it necessary to disable tests to not break whole testbed setups (where in older releases the tests would just fail).
-
-* [[!template id=pr number=49141]]: lib/librumpclient/t_exec/threxec test randomly fails
-* [[!template id=pr number=50350]]: rump/rumpkern/t_sp/stress_{long,short} fail
-* [[!template id=pr number=55304]]: lib/librumpclient/t_exec/threxec, rump/rumpkern/t_sp/reconnect now fail
-* [[!template id=pr number=55356]]: stress_killer test case now fails on real hardware
-* [[!template id=pr number=55338]]: rump threxec test broken
-* [[!template id=pr number=55632]]: tests/net/ipsec/t_ipsec_misc: timeout tests fail randomly
-
 ## Current status and timeline
 
 * no concrete timeline yet, to be re-evaluated end of September

commit uncommitted entries
--- /dev/null	2020-10-14 22:18:03.114807496 +0000
+++ wikisrc/amazon_ec2/bsdec2_image_upload.mdwn	2020-10-14 22:18:38.448728410 +0000
@@ -0,0 +1,68 @@
+# Creating a NetBSD AMI with bsdec2-image-upload
+
+## About bsdec2-image-upload
+
+The [bsdec2-image-upload](https://github.com/cperciva/bsdec2-image-upload) tool automates creation of AMIs based on raw disk images. This tool is available in pkgsrc as [sysutils/bsdec2-image-upload](https://pkgsrc.se/sysutils/bsdec2-image-upload).
+
+## Getting a disk image
+
+The following images are configured to automatically detect an EC2 environment and resize the root disk at boot. Creating a custom image is not covered in this document.
+
+### x86
+
+* NetBSD -current: <http://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/images/NetBSD-9.99.72-amd64-live.img.gz>
+* NetBSD 9.x: *not supported*
+
+### Arm
+
+* NetBSD -current: <http://nycdn.netbsd.org/pub/NetBSD-daily/HEAD/latest/evbarm-aarch64/binary/gzimg/arm64.img.gz>
+* NetBSD 9.x: <http://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-9/latest/evbarm-aarch64/binary/gzimg/arm64.img.gz>
+
+## Prerequisites
+
+### Install bsdec2-image-upload
+
+Install sysutils/bsdec2-image-upload from pkgsrc.
+
+### Setup AWS credentials
+
+In the [IAM Management Console](https://console.aws.amazon.com/iam), create an access key. Enter these into in a file named *keyfile.txt*:
+
+[[!template  id=filecontent name="keyfile.txt" text="""
+ACCESS_KEY_ID=your_access_key_id
+ACCESS_KEY_SECRET=your_access_key_secret
+"""]]
+
+### Create S3 bucket for image upload
+
+An S3 bucket is required for temporary storage during the upload and conversion process. This can be created on the [S3 Management Console](https://s3.console.aws.amazon.com).
+
+## Creating an AMI
+
+[[!template  id=filecontent name="x86" text="""
+$ gunzip NetBSD-9.99.72-amd64-live.img.gz
+$ AWS_REGION=us-east-1
+$ S3BUCKET=my-bucket-name
+$ bsdec2-image-upload --sriov --ena NetBSD-9.99.72-amd64-live.img "NetBSD 9.99.72 x86 2020-09-10" "NetBSD/amd64 -current (9.99.72) built on Sep 10 2020" ${AWS_REGION} ${S3BUCKET} keyfile.txt
+"""]]
+
+[[!template  id=filecontent name="Arm" text="""
+$ gunzip arm64.img.gz
+$ AWS_REGION=us-east-1
+$ S3BUCKET=my-bucket-name
+$ bsdec2-image-upload --sriov --ena --arm64 arm64.img "NetBSD 9.99.72 Arm 2020-09-10" "NetBSD/evbarm -current (9.99.72) built on Sep 10 2020" ${AWS_REGION} ${S3BUCKET} keyfile.txt
+"""]]
+
+### Cleanup
+
+Once the images are uploaded, some artifacts will be left in the S3 bucket. These can be safely deleted.
+
+## Starting an instance
+
+On the [EC2 Management Console](https://console.aws.amazon.com/ec2), select the region matching the AMI you just uploaded. Then under the AMIs section on the left, select your newly created AMI and click the Launch button to create a new instance.
+
+The credentials specified during creation of the instance can be used to login with ssh as the root user after NetBSD has booted:
+
+[[!template  id=filecontent name="remote login" text="""
+$ ssh -i netbsd.pem root@my-instance-ip
+"""]]
Index: wikisrc/ports/evbarm/qemu_arm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/qemu_arm.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/ports/evbarm/qemu_arm.mdwn	3 Dec 2019 12:52:20 -0000	1.8
+++ wikisrc/ports/evbarm/qemu_arm.mdwn	14 Oct 2020 22:18:02 -0000	1.9
@@ -41,6 +41,15 @@
           -netdev type=user,id=net0 -device virtio-net-device,netdev=net0,mac=00:11:22:33:44:55 \
           -bios QEMU_EFI.fd -nographic
 
+# Enabling graphics support
+To enable graphics support, remove the following command-line argument:
+
+    -nographic
+
+and replace it with:
+
+    -device ramfb -device nec-usb-xhci,id=xhci -device usb-mouse,bus=xhci.0 -device usb-kbd,bus=xhci.0
+
 # Bridged networking
 
 To bridge a QEMU guest to your network, you need to create a tap(4) interface for your VM, then connect it to a physical interface with a bridge(4) interface.
--- /dev/null	2020-10-14 22:18:03.114807496 +0000
+++ wikisrc/projects/project/Update_web_firewall_documentation_from_ipfilter_to_npf.mdwn	2020-10-14 22:18:38.524637483 +0000
@@ -0,0 +1,19 @@
+[[!template id=project
+
+title="Update web firewall documentation from ipfilter to npf"
+
+contact="""
+[tech-net](mailto:tech-net@NetBSD.org)
+"""
+
+category="networking"
+difficulty="medium"
+
+description="""
+It was decided some time ago that NPF is the One True NetBSD Firewall, and that the other, older in-tree firewalls of ipf and pf are going to be phased out due to relative lack of fixes, SMP support, and developers interested in maintaining them.
+
+The web-based documentation in the NetBSD Guide is still extensively describing ipfilter, however.
+
+It would be wise to start converting information from [rmind.github.io](https://rmind.github.io/npf/) and the various examples in `/usr/share/examples/npf`. 
+"""
+]]
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/releng/netbsd-10.mdwn	6 Aug 2020 18:34:31 -0000	1.22
+++ wikisrc/releng/netbsd-10.mdwn	14 Oct 2020 22:18:05 -0000	1.23
@@ -2,8 +2,6 @@
 
 ## PRs worth fixing
 
-(carried over unclosed PRs from earlier branches)
-
 * [[!template id=pr number=51734]]: hdaudio(4) "RIRB timeout" interrupt storm on boot
 * [[!template id=pr number=52583]]: iwm(4) "unhandled firmware response" followed by panic after extended use
 * [[!template id=pr number=53173]]: "go test net/http" locks up the machine
@@ -14,24 +12,34 @@
 * [[!template id=pr number=54727]]: writing a large file causes unreasonable system behaviour (should be fixed, needs to be checked)
 * [[!template id=pr number=54761]]: nvme corruption on GENERIC without DIAGNOSTIC
 * [[!template id=pr number=54771]]: nvme(4) fails to attach
+* [[!template id=pr number=54914]]: fcntl(F_GETPATH) is broken in chroot
 * [[!template id=pr number=55042]]: kernel panics when ZFS filesystem is exported with NFS
 * [[!template id=pr number=55458]]: entropy: WrAnRdNcING no nstropy in  eed
+* [[!template id=pr number=55510]]: pg_jobc going negative and crashing the kernel
 * [[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint
 
-Regressions since netbsd-9:
+## Regressions since netbsd-9
 
-* [[!template id=pr number=54913]]: fexecve(2) panics in chroot(8)
-* [[!template id=pr number=54914]]: fcntl(F_GETPATH) is broken in chroot
+* ~~[[!template id=pr number=54913]]: fexecve(2) panics in chroot(8)~~
 * [[!template id=pr number=55272]]: userland watchdog processes may be outstalled
-* [[!template id=pr number=55338]]: threxec test broken + kernel process lockup
 * [[!template id=pr number=55370]]: Invalid modification/connection time with mount_null(8)
-* [[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"
+* ~~[[!template id=pr number=55489]]: Infinite loop in "rump ifconfig bridge0 create"~~
 * [[!template id=pr number=55509]]: npm install -g electron crashes the kernel
-* [[!template id=pr number=55510]]: pg_jobc going negative and crashing the kernel
+* ~~[[!template id=pr number=55567]]: tcp-send slows down to slow single byte transfers~~
+
+## Extra severe Regressions since netbsd-9
+While the PR may be older (so "regression" slightly wrong) new scheduler bugs made it necessary to disable tests to not break whole testbed setups (where in older releases the tests would just fail).
+
+* [[!template id=pr number=49141]]: lib/librumpclient/t_exec/threxec test randomly fails
+* [[!template id=pr number=50350]]: rump/rumpkern/t_sp/stress_{long,short} fail
+* [[!template id=pr number=55304]]: lib/librumpclient/t_exec/threxec, rump/rumpkern/t_sp/reconnect now fail
+* [[!template id=pr number=55356]]: stress_killer test case now fails on real hardware
+* [[!template id=pr number=55338]]: rump threxec test broken
+* [[!template id=pr number=55632]]: tests/net/ipsec/t_ipsec_misc: timeout tests fail randomly
 
 ## Current status and timeline
 
-* no concrete timeline yet, to be re-evaluated end of July
+* no concrete timeline yet, to be re-evaluated end of September
 * current is in bad shape, hoping to see the best architectures with single digit unexpected failures before the branch
 
 ## Last Test Results overview
@@ -44,43 +52,43 @@
   <tbody>
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/amd64/">amd64</a>, qemu, official b5 runs</td>
-        <td>2020-07-14</td> <td>13 failures</td><td /><td />
+        <td>2020-08-30</td> <td>14 failures</td><td /><td />
+    </tr>
+    <tr>
+        <td><a href="//www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/">XEN</a>, i386 and amd64</td>
+        <td>2020-08-25</td> <td>14 failures</td><td></td><td/>
     </tr>
     <tr>
         <td><a href="//releng.netbsd.org/b5reports/i386/">i386</a>, qemu, official b5 runs</td>
-        <td>2020-07-14</td> <td>15 failures</td><td /><td />
+        <td>2020-08-30</td> <td>18 failures</td><td /><td />
     </tr>
     <tr>
         <td><a href="//www.NetBSD.org/~martin/sparc64-atf/">sparc64</a>, real hardware</td>
-        <td>2020-07-14</td> <td>19 failures</td><td /><td>Left over rump_server</td>
+        <td>2020-07-14</td> <td>19 failures</td><td /><td></td>
     </tr>
     <tr>
         <td><a href="//www.NetBSD.org/~martin/aarch64-atf/">evbarm64el-aarch64</a>, real hardware</td>
-        <td>2020-07-15</td> <td>77 failures</td><td></td><td>Left over rump_server</td>

(Diff truncated)
stub project for auto swap creation
--- /dev/null	2020-10-13 19:25:03.343478207 +0000
+++ wikisrc/projects/project/swap-auto.mdwn	2020-10-13 19:25:58.862964742 +0000
@@ -0,0 +1,30 @@
+[[!template id=project
+
+title="auto create swap on memory pressure"
+
+contact="""
+[tech-userlevel](mailto:tech-kern@NetBSD.org)
+"""
+
+mentors="""
+[Tech Kern](mailto:tech-kern@NetBSD.org)
+"""
+
+category="kernel"
+difficulty="medium"
+
+description="""
+
+When a system needs more memory but has free disk space it could auto create swap files and then delete them later.
+
+The ideal solution would be configurable for:
+* thresholds for creation
+* min/max (don't fill up the disk entirely)
+* encryption settings
+
+The "listener" for the file creation should avoid thrashing, have timeouts, and handle disk space usage sanely.
+
+"""
+]]
+
+[[!tag gsoc]]

Update plan for 9.1
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wikisrc/releng.mdwn	30 Aug 2020 11:56:55 -0000	1.42
+++ wikisrc/releng.mdwn	11 Oct 2020 10:38:25 -0000	1.43
@@ -14,7 +14,7 @@
 
 ### NetBSD 9.x
 
-* Next minor release: NetBSD 9.1 (tentative release date: September 24)
+* Next minor release: NetBSD 9.1 (planned release date: October 15)
   + CVS branch tag: <code>netbsd-9</code>
 * [Current pull-up queue for the netbsd-9 branch](http://releng.netbsd.org/cgi-bin/req-9.cgi)
 

capitals police
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- wikisrc/laptops.mdwn	4 Oct 2020 10:52:53 -0000	1.32
+++ wikisrc/laptops.mdwn	4 Oct 2020 18:20:19 -0000	1.33
@@ -42,7 +42,7 @@
 events (such as lid close) with
 [[!template id=man name="powerd" section="8"]].
 
-Suspend on NetBSD currently seems to work best on Thinkpads.
+Suspend on NetBSD currently seems to work best on ThinkPads.
 
 ## Input
 
@@ -94,16 +94,16 @@
 # IBM / Lenovo
 
 The [[!template id=man name="thinkpad" section="4"]] driver provides
-support for various Thinkpad-specific sensors and function keys.
+support for various ThinkPad-specific sensors and function keys.
 
-A number of NetBSD developers use Thinkpads to hack on NetBSD
+A number of NetBSD developers use ThinkPads to hack on NetBSD
 and for everyday usage.
 
 ## ThinkPad X1 Carbon (Ivy Bridge, i7)
 
 Installled with Coreboot and TianoCore (UEFI) firmware.
 
-Destroy the GPT data with `gpt destroy wd0` before installing.
+Destroy the GPT data with `gpt destroy wd0` before installing to the entire disk.
 
 Hardware support is basically perfect aside from the fingerprint reader, for which no driver exists.
 
@@ -129,7 +129,7 @@
 Everything works. Requires `PCI_BUS_FIXUP` and `PCI_ADDR_FIXUP` [[!template
 id=man name="options" section="4"]].
 
-## Thinkpad X220
+## ThinkPad X220
 
 * Video acceleration works, but when using `xf86-video-intel` (the default),
   it's advisable to set `Option "AccelMethod"  "uxa"` in `xorg.conf`.
@@ -137,13 +137,13 @@
 * WiFi is supported through the [[!template id=man name="iwn" section="4"]] driver.
 * Suspend and resume work.
 
-## Thinkpad X230
+## ThinkPad X230
 
 * Accelerated graphics.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwn" section="4"]] driver.
 
-## Thinkpad X250
+## ThinkPad X250
 
 * Accelerated graphics.
 * Connecting externals displays works with the miniDP and VGA ports.
@@ -161,7 +161,7 @@
   [[!template id=pr number=51734]]
 * Suspend and resume work.
 
-## Thinkpad X260
+## ThinkPad X260
 
 * Accelerated graphics.
 * SD card reader is supported through the [[!template id=man name="rtsx" section="4"]] driver.

x1 carbon
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- wikisrc/laptops.mdwn	17 Sep 2020 14:04:17 -0000	1.31
+++ wikisrc/laptops.mdwn	4 Oct 2020 10:52:53 -0000	1.32
@@ -99,6 +99,19 @@
 A number of NetBSD developers use Thinkpads to hack on NetBSD
 and for everyday usage.
 
+## ThinkPad X1 Carbon (Ivy Bridge, i7)
+
+Installled with Coreboot and TianoCore (UEFI) firmware.
+
+Destroy the GPT data with `gpt destroy wd0` before installing.
+
+Hardware support is basically perfect aside from the fingerprint reader, for which no driver exists.
+
+* GPU acceleration works.
+* WiFi is supported through the [[!template id=man name="iwn" section="4"]] driver.
+* SD card reader is supported through the [[!template id=man name="sdhc" section="4"]] driver.
+* Suspend/resume works.
+
 ## ThinkPad T22
 
 Works perfect (sound, display, all devices, infrared port not tested).

remove outdated information
Index: wikisrc/guide/cons.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/cons.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/guide/cons.mdwn	19 Jun 2015 19:18:31 -0000	1.3
+++ wikisrc/guide/cons.mdwn	3 Oct 2020 09:03:40 -0000	1.4
@@ -190,34 +190,10 @@
 However, you can enable a framebuffer on machines with VGA cards that support
 the VESA BIOS extension (VBE).
 
-Starting in NetBSD 6.0 ,
-[[!template id=man name="vesafb" section="4"]] has
-been replaced with
-[[!template id=man name="genfb" section="4"]]. VESA
-framebuffer mode is configured during
+VESA framebuffer mode is configured during
 [[!template id=man name="boot" section="8"]] using
 the `vesa` command.
 
-To enable support for this mode in NetBSD 4.x and 5.x, uncomment the following
-lines in the kernel configuration file:
-
-    # VESA framebuffer console
-    options     KVM86           # required for vesabios
-    vesabios*   at vesabiosbus?
-    vesafb*     at vesabios?
-    options     VESAFB_WIDTH=640
-    options     VESAFB_HEIGHT=480
-    options     VESAFB_DEPTH=8
-    options     VESAFB_PM       # power management support
-    wsdisplay*  at vesafb? console ?
-
-Beginning in NetBSD 4.0, if you have a VIA Unichrome-family graphics device, you
-can enable the following instead:
-
-    # VIA Unichrome framebuffer console
-    unichromefb*    at pci? dev ? function ?
-    wsdisplay*  at unichromefb?
-
 #### Enabling scrollback on the console
 
 You can enable scrolling back on wscons consoles by compiling the
@@ -363,47 +339,8 @@
 will overwrite the file instead of adding a line. But that's why we always make
 backup files before touching critical files!
 
-A full list of keyboard mappings can be found in
-`/usr/src/sys/dev/wscons/wsksymdef.h`:
-
- * `be` - Belgian
- * `de` - German
- * `dk` - Danish
- * `es` - Spanish
- * `fi` - Finnish
- * `fr` - French
- * `gr` - Greek
- * `hu` - Hungarian
- * `it` - Italian
- * `jp` - Japanese
- * `no` - Norwegian
- * `pl` - Polish
- * `pt` - Portuguese
- * `ru` - Russian
- * `sf` - Swiss French
- * `sg` - Swiss German
- * `sv` - Swedish
- * `ua` - Ukrainian
- * `uk` - UK-English
- * `us` - US-English
-
-There are also several "variants" that can be used to modify a map:
-
- * `declk`
- * `dvorak`
- * `iopener`
- * `lk401`
- * `metaesc`
- * `nodead`
- * `swapctrlcaps`
-
-`dvorak` uses the Dvorak keyboard layout. `swapctrlcaps` switches the functions
-of the Caps Lock and Left Control keys. `iopener` is for the nonstandard
-keyboard layout on the Netpliance i-opener and makes F1 into Escape and F2
-through F12 into F1 through F11. These can be combined with another map by
-appending a dot and then the variant name, for example, `us.iopener`. Multiple
-variants can be combined, such as `us.dvorak.swapctrlcaps`. Note that not all
-combinations are allowed.
+A full list of keyboard mappings and variants can be found in
+[[!template id=man name="wskbd" section="4"]].
 
 You can change the compiled in kernel default by adding `options
 PCKBD_LAYOUT=KB_encoding` where `encoding` is an uppercase entry from the list

GMT->UTC
Index: wikisrc/guide/boot.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/boot.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/guide/boot.mdwn	3 Oct 2020 06:13:35 -0000	1.11
+++ wikisrc/guide/boot.mdwn	3 Oct 2020 08:04:02 -0000	1.12
@@ -274,7 +274,7 @@
 
 ## System time
 
-NetBSD, like all Unix systems, uses a system clock based on Greenwich time (GMT)
+NetBSD, like all Unix systems, uses a system clock based on UTC
 and this is what you should set your system clock to. If you want to keep the
 system clock set to the local time (because, for example, you have a dual boot
 system with Windows installed), you must notify NetBSD by adding

more pkgin notes
Index: wikisrc/guide/boot.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/boot.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/guide/boot.mdwn	3 Oct 2020 06:08:56 -0000	1.10
+++ wikisrc/guide/boot.mdwn	3 Oct 2020 06:13:35 -0000	1.11
@@ -459,7 +459,10 @@
    server, and Firefox web browser, as well as all the packages they depend on.
 
    It is recommended you install and use pkgin for most non-trivial package
-   management tasks, and managing upgrades:
+   management tasks, and managing upgrades. pkgin can be installed from the
+   post-installation configuration menu in 
+   [[!template id=man name="sysinst" section="8"]], or afterwards using
+   [[!template id=man name="pkg_add" section="1"]] on a live system.
 
        # pkg_add -v pkgin
 

update package management instructions. recommend using pkgin.
Index: wikisrc/guide/boot.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/boot.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/guide/boot.mdwn	2 Sep 2019 20:48:36 -0000	1.9
+++ wikisrc/guide/boot.mdwn	3 Oct 2020 06:08:56 -0000	1.10
@@ -441,12 +441,12 @@
  * See the [list of available
    packages](http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/README-all.html)
 
- * Precompiled binaries are available on the NetBSD FTP server for some ports.
+ * Precompiled binaries are available on the NetBSD FTP server for many ports.
    To install them the `PKG_PATH` variable needs to be adjusted in the following
    way (under the
    [[!template id=man name="sh" section="1"]] shell):
 
-       # export PKG_PATH="http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -m)/$(uname -r)/All"
+       # export PKG_PATH="http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/$(uname -p)/$(uname -r)/All"
        # export PKG_PATH
 
    Applications can now be installed by `root` with the pkg\_add command:
@@ -454,29 +454,17 @@
        # pkg_add -v perl
        # pkg_add -v apache
        # pkg_add -v firefox
-       # pkg_add -v kde
 
    The above commands will install the Perl programming language, Apache web
-   server, Firefox web browser and the KDE desktop environment as well as all
-   the packages they depend on.
+   server, and Firefox web browser, as well as all the packages they depend on.
 
-   Installed applications can be updated in the following way:
+   It is recommended you install and use pkgin for most non-trivial package
+   management tasks, and managing upgrades:
 
-       # pkg_add -uv firefox
+       # pkg_add -v pkgin
 
-   The following command will force an update of firefox and all of its
-   dependencies:
-
-       # pkg_add -fuuv firefox
-
-   All details about package management can be found in [*The pkgsrc
-   guide*](http://www.NetBSD.org/docs/pkgsrc/index.html)
-
- * Maybe you already installed
-   [pkgtools/pkgin](http://pkgsrc.se/pkgtools/pkgin). `sysinst` provides an
-   option to install pkgin (if not, you can install it like any other software).
-   `pkgin` is a binary package manager, but more sophisticated than `pkg_add`.
-   It maintains a database of packages on the server you can fetch with:
+   It maintains a local database of packages that are on the remote server,
+   you can fetch the database with:
 
        # pkgin update
 
@@ -489,6 +477,10 @@
 
        # pkgin install fscd
 
+   To upgrade installed packages:
+
+       # pkgin upgrade
+
    You should read the manpage to know about more actions you can do with pkgin.
 
 ### Storing third-party software

minor formatting nits
Index: wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:17:26 -0000	1.4
+++ wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:27:59 -0000	1.5
@@ -256,7 +256,7 @@
     urtwn_vap_delete(struct ieee80211vap *vap)
     {
         struct ifnet *ifp = vap->iv_ifp;
-	struct urtwn_softc *sc __unused = vap->iv_ic->ic_softc;
+        struct urtwn_softc *sc __unused = vap->iv_ic->ic_softc;
 
         bpf_detach(ifp);
         ieee80211_vap_detach(vap);

Fix some outdated infos
Index: wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:13:10 -0000	1.3
+++ wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:17:26 -0000	1.4
@@ -18,7 +18,7 @@
 being created (by pure software) using the same physical radio device.
 
  At the user level the radio hardware is hidden quite well - it only
-shows up in dmesg or "sysctl net.wlan.devices".
+shows up in dmesg or ``sysctl net.wlan.devices``.
 There is no network interface for the raw hardware, so ifconfig will
 not show them.
 
@@ -30,11 +30,11 @@
  This split between common radio hardware and per-VAP network properties
 reflects on the driver and causes most of the changes needed.
 
- After creation of the wlan0 VAP, it will also show up under
+ After creation of the ``wlan0`` VAP, it will also show up under
 
-    sysctl net.wlan.0
+    sysctl net.wlan.wlan0
 
- and in ifconfig output (as wlan0).
+ and in ifconfig output.
 
   More complete instructions for testing are here: [[Testing new wifi]].
   There also is an older paper describing the initial design in FreeBSD:

Add links to the testing instructions and the original design paper
Index: wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:06:34 -0000	1.2
+++ wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:13:10 -0000	1.3
@@ -36,6 +36,10 @@
 
  and in ifconfig output (as wlan0).
 
+  More complete instructions for testing are here: [[Testing new wifi]].
+  There also is an older paper describing the initial design in FreeBSD:
+  [FreeBSD wireless BSDCan 2005](https://www.bsdcan.org/2005/papers/FreeBSDWirelessNetwokringSupport.pdf)
+
 # Step by Step at the driver level
 
  * The data is split into the generic ``struct ieee80211com``

Mark multiline code blocks
Index: wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 17:51:24 -0000	1.1
+++ wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	29 Sep 2020 18:06:34 -0000	1.2
@@ -87,6 +87,7 @@
    use it mostly verbatim. Rename it to ``driver_get_radiocaps`` and
    make it look like:
 
+    ```
     static void
     urtwn_get_radiocaps(struct ieee80211com *ic,
         int maxchans, int *nchans, struct ieee80211_channel chans[])
@@ -99,6 +100,7 @@
         setbit(bands, IEEE80211_MODE_11NG);
         ieee80211_add_channels_default_2ghz(chans, maxchans, nchans, bands, 0);
     }
+    ```
 
    and also assign this function to ``ic->ic_getradiocaps`` in
    the attach function.
@@ -107,11 +109,13 @@
    You can just call the ``driver_get_radiocaps()`` function during
    attach like:
 
-     urtwn_get_radiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,   
-          ic->ic_channels);
-     ieee80211_ifattach(ic);
-     [..]
-     ic->ic_getradiocaps = urtwn_get_radiocaps;
+    ```
+    urtwn_get_radiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,   
+         ic->ic_channels);
+    ieee80211_ifattach(ic);
+    [..]
+    ic->ic_getradiocaps = urtwn_get_radiocaps;
+    ```
 
  * If your driver used to override state machine functions (typical
    ``newstate`` to controll LEDs when associating or similar),
@@ -128,11 +132,13 @@
  * Many functions will get a ``struct ieee80211vap *vap`` passed instead
    of a softc. A typical change to adapt for that looks like:
 
+    ```
     -       struct ieee80211com *ic = &sc->sc_ic;
     -       struct ieee80211_node *ni = ic->ic_bss;
     +       struct ieee80211com *ic = vap->iv_ic;
     +       struct rtwn_softc *sc = ic->ic_softc;
     +       struct ieee80211_node *ni = vap->iv_bss;
+    ```
 
  * The hardware driver will need a global new outgoing packet queue
    (as the per-interface queues are attached to VAPs, not the single
@@ -146,8 +152,10 @@
 
    This queue needs initialization in the attach function, like:
 
+    ```
     sc->sc_sendq.ifq_maxlen = ifqmaxlen;
     IFQ_LOCK_INIT(&sc->sc_sendq);
+    ```
 
    This device private send queue (writer: any of the current VAPs
    of this interface, consumer: the devices transmit interrupt handler)
@@ -167,8 +175,10 @@
    and ``sc->nrxchains`` or similar variables. This information
    needs to be propagated to the common radio structure:
 
+    ```
     ic->ic_txstream = sc->ntxchains;
     ic->ic_rxstream = sc->nrxchains;
+    ```
 
    Same for interface flags:
 
@@ -178,6 +188,7 @@
    need to be overwritten. The functions needed are explained
    below, here is a typical setup:
 
+    ```
     /* override default methods */
     ic->ic_newassoc = urtwn_newassoc;
     ic->ic_wme.wme_update = urtwn_wme_update;
@@ -189,6 +200,7 @@
     ic->ic_set_channel = urtwn_set_channel;
     ic->ic_transmit = urtwn_transmit;
     ic->ic_raw_xmit = urtwn_raw_xmit;
+    ```
 
 
  * detach does not deal with any interfaces any more, remove all traces
@@ -197,6 +209,7 @@
  * Add a new function for VAP creation and move all interface specific
    setup there. It looks like:
 
+    ```
     static struct ieee80211vap *
     urtwn_vap_create(struct ieee80211com *ic,  const char name[IFNAMSIZ],
         int  unit, enum ieee80211_opmode opmode, int flags,
@@ -209,6 +222,7 @@
     ...
            return vap;
     }
+    ```
 
    It allocates a new VAP with ``kmem_zalloc`` initializes it
    by calling ``ieee80211_vap_setup`` for it and then ovverriding whatever
@@ -219,8 +233,10 @@
    (that probably means: for all devices that are not on USB)
    you need to initialize the per CPU interface queue:
 
+    ```
     /* Use common softint-based if_input */
     ifp->if_percpuq = if_percpuq_create(ifp);
+    ```
 
    If your interrupt handler always is called in softint context,
    do not do this. If if_percpuq is NULL the wifi framework will
@@ -231,6 +247,7 @@
    parts that you deleted in the detach() function here. A very
    minimalistic example looks like:
 
+    ```
     static void
     urtwn_vap_delete(struct ieee80211vap *vap)
     {
@@ -241,26 +258,33 @@
         ieee80211_vap_detach(vap);
         kmem_free(vap, sizeof(struct ieee80211vap));
     }
+    ```
 
  * Rate Adaption happens per VAP, so the ra_init call changes like this:
 
+    ```
     -static int urtwn_ra_init(struct urtwn_softc *);
     +static int urtwn_ra_init(struct ieee80211vap );
+    ```
 
    See above for recipes how to acces the needed structs in there.
 
  * State is per VAP, so newstate changes the first parameter:
 
+    ```
     -static int urtwn_newstate(struct ieee80211com *, enum ieee80211_state, int);
     +static int urtwn_newstate(struct ieee80211vap *, enum ieee80211_state, int);
+    ```
 
    If there was a newstate_cb function previously, it is probably not needed
    any more.
 
  * Reset is per interface, so per VAP:
 
+    ```
     -static int urtwn_reset(struct ifnet *);
     +static int urtwn_reset(struct ieee80211vap *, u_long cmd);
+    ```
 
    A driver is not required to provide this method, if not filled in a
    default method will be used that always causes a full reset of the
@@ -295,6 +319,7 @@
    mbuf to the hardware send queue (and start transmission if needed).
    A very simple example:
 
+    ```
     static int
     urtwn_transmit(struct ieee80211com *ic, struct mbuf *m)
     {  
@@ -310,6 +335,7 @@
 
         return 0;
     }
+    ```
 
    A pointer to this function is assigned to the ic->ic_transmit member
    in the attach function.
@@ -317,31 +343,36 @@
  * Your driver needs a raw_xmit function which is close to what
    the old driver called *_tx(), it looks like:
 
+    ```
     static int
     urtwn_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
         const struct ieee80211_bpf_params *bpfp)
+    ```
 
    and the "missing" arguments are derived like:
 
+    ```
     struct ieee80211vap *vap = ni->ni_vap;
     struct ieee80211com *ic = ni->ni_ic;
     struct urtwn_softc *sc = ic->ic_softc;
+    ```
 
-   The check for encrypting packets often was testing the ieee80211_frame
-   wh->i_fc[1] & IEEE80211_FC1_WE before encapsulating the mbuf

(Diff truncated)
New page trying to describe the conversion of wifi drivers from old to new stack
--- /dev/null	2020-09-29 17:51:03.356118658 +0000
+++ wikisrc/Converting_drivers_to_the_new_wifi_stack.mdwn	2020-09-29 17:51:52.087546341 +0000
@@ -0,0 +1,444 @@
+# Intro
+
+ This guide is meant to help you convert an old style NetBSD driver
+for a wifi device to the newer wifi stack based on FreeBSD's current
+version.
+
+ This is work in progress, as we are trying to create helper functions
+and libraries where usefull, and also the target API is a slightly
+moving target.
+
+# Overview
+
+ The main difference between old style and new style drivers is the
+VAP concept. VAP means Virtual Access Point, and it is used to split
+the configuration properties of a wlan (as visible on air) from the
+radio hardware. In many cases multiple wlans can be created using a
+single radio hardware, which is naturally modelled as multiple VAPs
+being created (by pure software) using the same physical radio device.
+
+ At the user level the radio hardware is hidden quite well - it only
+shows up in dmesg or "sysctl net.wlan.devices".
+There is no network interface for the raw hardware, so ifconfig will
+not show them.
+
+ To create a VAP for a radio device (and that way a network interface)
+use a command like:
+
+    ifconfig wlan0 create wlandev run0
+
+ This split between common radio hardware and per-VAP network properties
+reflects on the driver and causes most of the changes needed.
+
+ After creation of the wlan0 VAP, it will also show up under
+
+    sysctl net.wlan.0
+
+ and in ifconfig output (as wlan0).
+
+# Step by Step at the driver level
+
+ * The data is split into the generic ``struct ieee80211com``
+   describing the radio hardware (often used as ``ic`` pointer),
+   which is part of the drivers softc. The individual VAPs are
+   in a TAILQ in the ic structure, and often are a driver defined
+   structure 'derived' from ``struct ieee80211vap`` (with some
+   additional driver specific data). The VAP structure has the
+   network interface ``struct ifnet`` as ``iv_ifp.
+   The ``if_softc`` pointer in
+   the ifnet structure points to the VAP, the VAP structure
+   has a pointer to the ic ``iv_ic``,
+   the ic structure has a ``ic_softc`` pointer to the softc.
+
+ * MAC addresses are now stored in ic_macaddr instead of ic_myaddr
+   (in struct ieee80211com). It is typically read from the device
+   and cloned into each VAP. Typical code:
+
+    IEEE80211_ADDR_COPY(ic->ic_macaddr, rom->macaddr);
+
+ * In the attach function, no ``struct ifnet ifp`` will be needed,
+   so get rid of code like:
+
+     struct ifnet *ifp = GET_IFP(sc);
+
+   and all initialization of ifp members. Move them to the vap_create
+   function (see below) if needed instead, but typically none
+   should be needed (as the generic code initializes the VAP's
+   struct ifnet).
+
+   Set a direct backlink to the softc, like:
+
+    ic->ic_softc = sc;
+
+   Make sure the ic_caps get initialized correctly to the capabilities
+   of the radio, especially you want to add IEEE80211_C_STA for
+   standard AP (station) mode.
+
+   There is no statemachine in the common radio part, it all moves into
+   per-VAP state, so also remove initialization for it, like:
+
+    ic->ic_state = IEEE80211_S_INIT;
+
+   You may want a replacement for IFF_OACATIVE logic for the main device,
+   as there is no interface so no flags to (ab)use for that.
+
+   Note that the way channels are set up has changed.
+   If your driver had a driver_init_channels() function, you can
+   use it mostly verbatim. Rename it to ``driver_get_radiocaps`` and
+   make it look like:
+
+    static void
+    urtwn_get_radiocaps(struct ieee80211com *ic,
+        int maxchans, int *nchans, struct ieee80211_channel chans[])
+    {
+        uint8_t bands[IEEE80211_MODE_BYTES];
+        
+        memset(bands, 0, sizeof(bands));
+        setbit(bands, IEEE80211_MODE_11B);
+        setbit(bands, IEEE80211_MODE_11G);
+        setbit(bands, IEEE80211_MODE_11NG);
+        ieee80211_add_channels_default_2ghz(chans, maxchans, nchans, bands, 0);
+    }
+
+   and also assign this function to ``ic->ic_getradiocaps`` in
+   the attach function.
+
+   An initial setup must happen before calling ``ieee80211_ifattach(ic)``.
+   You can just call the ``driver_get_radiocaps()`` function during
+   attach like:
+
+     urtwn_get_radiocaps(ic, IEEE80211_CHAN_MAX, &ic->ic_nchans,   
+          ic->ic_channels);
+     ieee80211_ifattach(ic);
+     [..]
+     ic->ic_getradiocaps = urtwn_get_radiocaps;
+
+ * If your driver used to override state machine functions (typical
+   ``newstate`` to controll LEDs when associating or similar),
+   remove all traces for this from your softc and override a
+   custom VAP type instead (i.e. derive a struct from
+   struct ieee80211vap and use your own struct in your vap_create
+   and vap_delete method).
+
+   Remove the (likely to exist) old sc_newstate function from
+   your drivers softc (previously used to store the frameworks
+   newstate function, which now is per VAP and moved into your
+   derived per-VAP structure.
+
+ * Many functions will get a ``struct ieee80211vap *vap`` passed instead
+   of a softc. A typical change to adapt for that looks like:
+
+    -       struct ieee80211com *ic = &sc->sc_ic;
+    -       struct ieee80211_node *ni = ic->ic_bss;
+    +       struct ieee80211com *ic = vap->iv_ic;
+    +       struct rtwn_softc *sc = ic->ic_softc;
+    +       struct ieee80211_node *ni = vap->iv_bss;
+
+ * The hardware driver will need a global new outgoing packet queue
+   (as the per-interface queues are attached to VAPs, not the single
+   common transmit hardware). Add the new ifque like to your softc
+   like this:
+
+    struct ifqueue sc_sendq;
+
+   While there, check that there is no "struct ethercom sc_ec" in your
+   softc - it is not needed.
+
+   This queue needs initialization in the attach function, like:
+
+    sc->sc_sendq.ifq_maxlen = ifqmaxlen;
+    IFQ_LOCK_INIT(&sc->sc_sendq);
+
+   This device private send queue (writer: any of the current VAPs
+   of this interface, consumer: the devices transmit interrupt handler)
+   abuses the mbuf rcvif pointer to store the node pointer
+   ``struct ieee80211_node *`` of the target node for this packet.
+   When dequeing a packet before handing it over to the output function,
+   the node is extracted and the rcvif pointer set to NULL.
+   Yes - this is a hack.
+
+   Also the attach function needs to set the name of the interface
+   in the common radio device structure:
+
+    ic->ic_name = device_xname(self);
+
+   Many drivers query the hardware/firmware for the number of available
+   input / output queues and store these in e.g. ``sc->ntxchains``
+   and ``sc->nrxchains`` or similar variables. This information
+   needs to be propagated to the common radio structure:
+
+    ic->ic_txstream = sc->ntxchains;
+    ic->ic_rxstream = sc->nrxchains;
+
+   Same for interface flags:
+
+    ic->ic_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+
+   After calling ``ieee80211_ifattach(ic);`` some methods in ic
+   need to be overwritten. The functions needed are explained
+   below, here is a typical setup:
+
+    /* override default methods */
+    ic->ic_newassoc = urtwn_newassoc;
+    ic->ic_wme.wme_update = urtwn_wme_update;
+    ic->ic_vap_create = urtwn_vap_create;
+    ic->ic_vap_delete = urtwn_vap_delete;
+    ic->ic_parent = urtwn_parent;
+    ic->ic_scan_start = urtwn_scan_start;
+    ic->ic_scan_end = urtwn_scan_end;
+    ic->ic_set_channel = urtwn_set_channel;
+    ic->ic_transmit = urtwn_transmit;
+    ic->ic_raw_xmit = urtwn_raw_xmit;
+
+
+ * detach does not deal with any interfaces any more, remove all traces
+   of ``struct ifnet *ifp``.
+
+ * Add a new function for VAP creation and move all interface specific

(Diff truncated)
Add new linke for wifi driver conversion
Index: wikisrc/tutorials.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials.mdwn,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- wikisrc/tutorials.mdwn	25 Sep 2020 19:09:56 -0000	1.42
+++ wikisrc/tutorials.mdwn	29 Sep 2020 17:29:21 -0000	1.43
@@ -38,6 +38,7 @@
 * [[Kernel debugging with QEMU]]
 * [[Wifi renewal on hg]]
 * [[Testing new wifi]]
+* [[Converting drivers to the new wifi stack]]
 
 ### Testing
 * [[atf]]

Setting LANG is enough to adjust user's locale, suggests that.
Index: wikisrc/tutorials/unicode.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/unicode.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/tutorials/unicode.mdwn	23 May 2020 14:31:07 -0000	1.3
+++ wikisrc/tutorials/unicode.mdwn	27 Sep 2020 12:21:10 -0000	1.4
@@ -71,21 +71,13 @@
 
 ##  Shell environment 
 
-Set the variables `LANG` and `LC_CTYPE` in your shell configuration file 
+Set the variables `LANG` in your shell configuration file :
     
        export LANG="en_US.UTF-8"
-       export LC_CTYPE="en_US.UTF-8"
-       export LC_ALL=""
-    
 
 or if you have a C-style shell 
     
        setenv LANG "en_US.UTF-8"
-       setenv LC_CTYPE "en_US.UTF-8"
-       setenv LC_ALL ""
-    
-
-The other locale variables should be left untouched, which is "`C`" by default, to not confuse programs. Locales other than `en_US` probably won't work too well, since the fonts aren't in the base system yet, but you can install them and try your luck, of course. 
 
 The result should look like 
     
@@ -93,9 +85,9 @@
        LANG="en_US.UTF-8"
        LC_CTYPE="en_US.UTF-8"
        LC_COLLATE="C"
-       LC_TIME="C"
-       LC_NUMERIC="C"
-       LC_MONETARY="C"
+       LC_TIME="en_US.UTF-8"
+       LC_NUMERIC="en_US.UTF-8"
+       LC_MONETARY="en_US.UTF-8"
        LC_MESSAGES="en_US.UTF-8"
        LC_ALL=""
     

completed
Index: wikisrc/projects/project/move-beyond-twm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/move-beyond-twm.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/move-beyond-twm.mdwn	17 Feb 2016 06:15:53 -0000	1.2
+++ wikisrc/projects/project/move-beyond-twm.mdwn	26 Sep 2020 14:26:25 -0000	1.3
@@ -6,10 +6,16 @@
 [tech-x11](mailto:tech-x11@NetBSD.org)
 """
 
+done_by="Youri Mouton, Nia Alarie"
+
 category="desktop"
 difficulty="medium"
 
 description="""
+
+***Update***: This project is completed. ctwm was imported in 2015 by
+Youri, and Nia wrote a reworked config and made in the default in 2020.
+
 Right now if you install NetBSD with native X11 you get the same
 default X session that X has shipped forever, complete with TWM. Just
 like it's 1989.
@@ -59,14 +65,5 @@
 
 There might be other possible choices; these two are the ones in
 pkgsrc that seem viable.
-
-Note: this project is not listed as a GSoC project (although doing the
-needed work on golem maybe could be one) because much of it has to do
-with build system integration and ancient X things and other stuff
-that requires experience a student probably won't have.
-
-Update: current state is that a window manager has been chosen and
-imported; however, the themes are not ready and the default session
-has not been switched over yet.
 """
 ]]

First draft of instructions how to test new wifi
--- /dev/null	2020-09-25 19:39:03.792413381 +0000
+++ wikisrc/Testing_new_wifi.mdwn	2020-09-25 19:39:27.073093852 +0000
@@ -0,0 +1,65 @@
+There is a project in progress to adapt the latest FreeBSD wifi stack for NetBSD.
+
+This stack introduces the concept of a virtual access point (VAP) and requires changes to the way wifi networks are configured.
+
+Currently there are no pre-build binary sets, so first task is to check out the wifi topic from hg and build it.
+
+At this point a full build will not work (due to unconverted drivers), but you can do something along the lines of:
+
+    build.sh -m ${arch} -V MKRUMP=no sets
+
+to build the sets, and then create you own kernel configuration or add a GENERIC.local file and exclude the non buildable drivers.
+
+There is a custom kernel sys/arch/amd64/conf/SEVEN_WIFI that can be used as a template for amd64 kernels. Here is an example of a GENERIC.local for evbarm GENERIC kernels:
+
+    no athn*
+    no bwfm*
+    no atu*
+    no otus*
+    no rum*
+    no run*
+    no upgt*
+    no ural*
+    no urtw*
+    no zyd*
+
+After building userland sets and kernel install both (preferably on a secondary disk or a netboot environment, as this is not fully functional yet).
+
+After booting into the new system you will notice that no wlan devices show up in ifconfig -a output. Instead you can see the wlan devices in sysctl output:
+
+    # sysctl net.wlan
+    net.wlan.debug = 0
+    net.wlan.devices = urtwn0
+
+Now you can create a VAP (called wlan0) by doing:
+
+    # ifconfig wlan0 create wlandev urtwn0
+
+This VAP shows up in sysctl output:
+
+    # sysctl net.wlan
+    net.wlan.debug = 0
+    net.wlan.devices = urtwn0
+    net.wlan.wlan0.parent = urtwn0
+    net.wlan.wlan0.driver_caps = 629194753
+    net.wlan.wlan0.debug = 0
+    net.wlan.wlan0.bmiss_max = 2
+    net.wlan.wlan0.inact_run = 300
+    net.wlan.wlan0.inact_probe = 30
+    net.wlan.wlan0.inact_auth = 180
+    net.wlan.wlan0.inact_init = 30
+    net.wlan.wlan0.ampdu_mintraffic_bk = 128
+    net.wlan.wlan0.ampdu_mintraffic_be = 64
+    net.wlan.wlan0.ampdu_mintraffic_vo = 32
+    net.wlan.wlan0.ampdu_mintraffic_vi = 32
+    net.wlan.wlan0.force_restart = 0
+
+and you can further configure it with ifconfig
+
+    # ifconfig wlan0 up
+    # ifconfig wlan0 list scan
+    SSID                  BSSID              CHAN RATE  S:N     INT CAPS
+    aprisoft              e0:28:6d:59:cb:90    1   54M  94:0    100 EPS  WME WPA RSN
+
+
+This sounds a bit strange at first sight, but multiple networks (one per VAP) for a single radio do make sense. Here is the original paper describing the design: [FreeBSD wireless BSDCan 2005](https://www.bsdcan.org/2005/papers/FreeBSDWirelessNetwokringSupport.pdf)

Add new link for wifi testing
Index: wikisrc/tutorials.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials.mdwn,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wikisrc/tutorials.mdwn	26 Apr 2020 11:40:53 -0000	1.41
+++ wikisrc/tutorials.mdwn	25 Sep 2020 19:09:56 -0000	1.42
@@ -37,6 +37,7 @@
 ### Kernel
 * [[Kernel debugging with QEMU]]
 * [[Wifi renewal on hg]]
+* [[Testing new wifi]]
 
 ### Testing
 * [[atf]]

since people are getting confused about how drivers work
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wikisrc/laptops.mdwn	11 Sep 2020 14:22:10 -0000	1.30
+++ wikisrc/laptops.mdwn	17 Sep 2020 14:04:17 -0000	1.31
@@ -2,6 +2,9 @@
 and portable computers that work well with NetBSD, are of interest
 to developers, and are standardized or easy to find.
 
+This page references lots of different device drivers. All of them
+are built-in to GENERIC kernels and you don't need to load them.
+
 [[!toc ]]
 
 ---

it's ARMv8-A
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 08:14:33 -0000	1.96
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 08:17:29 -0000	1.97
@@ -32,7 +32,7 @@
   most recent and common 32-bit ARM boards.
 - evbarm-earmv7hfeb - Same as the above, but with the CPU running in
   big endian mode.
-- evbarm-aarch64 - 64-bit ARMv8
+- evbarm-aarch64 - 64-bit ARMv8-A
 - evbarm-aarch64eb - Same as the above, but with the CPU running in
   big endian mode.
 
@@ -58,7 +58,10 @@
  - [[RockChip SoCs|RockChip]]
  - [[Terasic DE0 Nano-SoC|Cyclone5]]
 
-**NOTE**: This list is incomplete. For a full list of supported boards, please see the list of [32-bit](https://github.com/NetBSD/src/blob/netbsd-9/sys/arch/evbarm/conf/GENERIC#L18) and [64-bit](https://github.com/NetBSD/src/blob/netbsd-9/sys/arch/evbarm/conf/GENERIC64#L20) device trees.
+**NOTE**: This list is incomplete. For a full list of supported device tree
+based boards, please see the list of
+[32-bit](https://github.com/NetBSD/src/blob/netbsd-9/sys/arch/evbarm/conf/GENERIC#L18) and
+[64-bit](https://github.com/NetBSD/src/blob/netbsd-9/sys/arch/evbarm/conf/GENERIC64#L20) device trees.
 
 ### QEMU
 

moar updates indicating the level of CPU support
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 08:11:13 -0000	1.95
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 08:14:33 -0000	1.96
@@ -26,9 +26,9 @@
 
 Various CPU variants are supported, e.g:
 
-- evbarm-earmv6hf - ARMv6 with EABI and hardware floating point, e.g.
+- evbarm-earmv6hf - ARMv6-A with EABI and hardware floating point, e.g.
   the original Raspberry Pi.
-- evbarm-earmv7hf - ARMv7 with EABI and hardware floating point, e.g.
+- evbarm-earmv7hf - ARMv7-A with EABI and hardware floating point, e.g.
   most recent and common 32-bit ARM boards.
 - evbarm-earmv7hfeb - Same as the above, but with the CPU running in
   big endian mode.
@@ -38,7 +38,8 @@
 
 Since NetBSD 9.0, 64-bit ARM processors are supported (referred to here
 as aarch64). These run with fully 64-bit kernels and userland. Running
-32-bit ARM binaries is also supported with `compat32`.
+32-bit ARM binaries is also supported with `compat32`. The 64-bit
+kernel supports up to 256 CPUs and the 32-bit kernel supports up to 8.
 
 Since NetBSD 9.0, there is support for symmetric and asymmetrical
 multiprocessing (aka big.LITTLE).

moar updates indicating the level of CPU support
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:55:44 -0000	1.94
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 08:11:13 -0000	1.95
@@ -16,10 +16,10 @@
 about="""
 NetBSD/evbarm is the port of NetBSD to various systems based on chips
 implementing the ARM architecture. The "evb" component is a reference
-to evaluation boards, the original target of the port, but this
-is no longer relevant - NetBSD/evbarm now runs on a range of
-hardware based on APCI or devicetrees, including a range of development
-boards, powerful servers, virtual machines, and even some laptops.
+to evaluation boards, the original target of the port. However, the
+single GENERIC/GENERIC64 kernel now supports a range of machines including
+development boards, virtual machines, "ServerReady" (SBBR/SBSA) hardware,
+and laptops through both device tree and ACPI based booting.
 """
 supported_hardware="""
 ### CPU types
@@ -40,6 +40,9 @@
 as aarch64). These run with fully 64-bit kernels and userland. Running
 32-bit ARM binaries is also supported with `compat32`.
 
+Since NetBSD 9.0, there is support for symmetric and asymmetrical
+multiprocessing (aka big.LITTLE).
+
 evbarm variants are little endian unless otherwise stated. NetBSD provides
 big endian images primarily for testing purposes and to ensure that the code
 is endian-clean.

evbarm install notes for 9.0 are pretty misleading
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:50:45 -0000	1.93
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:55:44 -0000	1.94
@@ -1,12 +1,11 @@
 [[!template id=port
 port="evbarm"
 port_alt="arm"
-port_var1="earm"
-port_var2="earmeb"
-port_var3="earmv6hf"
-port_var4="earmv7hf"
-port_var5="earmv7hfeb"
-port_var6="aarch64"
+port_var1="earmv6hf"
+port_var2="earmv7hf"
+port_var3="earmv7hfeb"
+port_var4="aarch64"
+no_install_notes=YES <!-- XXX update this after 9.1 -->
 port_var_install_notes="evbarm-earm"
 pkg_rel="9.0"
 cur_rel="9.0"

fix link to board image
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:48:57 -0000	1.92
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:50:45 -0000	1.93
@@ -13,7 +13,7 @@
 future_rel="10.0"
 changes_cur="9.0"
 changes_future="10.0"
-thumbnail="//www.netbsd.org/images/ports/evbarm/beaglebone.jpg"
+thumbnail="//wiki.netbsd.org/ports/evbarm/images/beaglebone.jpg"
 about="""
 NetBSD/evbarm is the port of NetBSD to various systems based on chips
 implementing the ARM architecture. The "evb" component is a reference

slightly less obscure board image
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:45:49 -0000	1.91
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:48:57 -0000	1.92
@@ -13,7 +13,7 @@
 future_rel="10.0"
 changes_cur="9.0"
 changes_future="10.0"
-thumbnail="//www.netbsd.org/images/ports/evbarm/adi_brh.gif"
+thumbnail="//www.netbsd.org/images/ports/evbarm/beaglebone.jpg"
 about="""
 NetBSD/evbarm is the port of NetBSD to various systems based on chips
 implementing the ARM architecture. The "evb" component is a reference

use template sections
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:36:01 -0000	1.90
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:45:49 -0000	1.91
@@ -8,6 +8,7 @@
 port_var5="earmv7hfeb"
 port_var6="aarch64"
 port_var_install_notes="evbarm-earm"
+pkg_rel="9.0"
 cur_rel="9.0"
 future_rel="10.0"
 changes_cur="9.0"
@@ -21,8 +22,7 @@
 hardware based on APCI or devicetrees, including a range of development
 boards, powerful servers, virtual machines, and even some laptops.
 """
-]]
-
+supported_hardware="""
 ### CPU types
 
 Various CPU variants are supported, e.g:
@@ -45,10 +45,6 @@
 big endian images primarily for testing purposes and to ensure that the code
 is endian-clean.
 
-### armbsd.org builds
-
-NetBSD developer Jared McNeill provides [builds of NetBSD 9 and -current for a vast variety of hardware.](https://www.armbsd.org/)   In addition to the standard build, these images have board-specific U-Boot contents.  See also /usr/pkgsrc/sysutils/u-boot*.
-
 ### Board specific information (often including installation information)
 
  - [[Allwinner sunxi family SoCs|Allwinner]]
@@ -64,13 +60,20 @@
 ### QEMU
 
 See the [[NetBSD/evbarm under QEMU|qemu_arm]] page for instructions on how to get started with QEMU.
+"""
+additional="""
+### armbsd.org builds
+
+NetBSD developer Jared McNeill provides [builds of NetBSD 9 and -current for a vast variety of hardware.](https://www.armbsd.org/)   In addition to the standard build, these images have board-specific U-Boot contents.  See also /usr/pkgsrc/sysutils/u-boot*.
 
 ### anita
 
 anita can be used to test builds.  (In addition to anita, install qemu and dtb-arm-vexpress from pkgsrc.)   The release subdirectory should follow the naming convention on the autobuild cluster, used below.
 
- - evbarm-earmv7hf uses "qemu-system-arm -M vexpress-a15"
- - evbarm-aarch64 uses "qemu-system-aarch64 -M virt"
+ - evbarm-earmv7hf uses 'qemu-system-arm -M vexpress-a15'
+ - evbarm-aarch64 uses 'qemu-system-aarch64 -M virt'
  - Information on how to test emulated versions of other specific hardware is welcome.
+"""
+]]
 
 [[!tag tier1port]]

close the tag properly
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:33:25 -0000	1.89
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:36:01 -0000	1.90
@@ -21,6 +21,7 @@
 hardware based on APCI or devicetrees, including a range of development
 boards, powerful servers, virtual machines, and even some laptops.
 """
+]]
 
 ### CPU types
 
@@ -36,14 +37,14 @@
 - evbarm-aarch64eb - Same as the above, but with the CPU running in
   big endian mode.
 
-evbarm variants are little endian unless otherwise stated. NetBSD provides
-big endian images primarily for testing purposes and to ensure that the code
-is endian-clean.
-
 Since NetBSD 9.0, 64-bit ARM processors are supported (referred to here
 as aarch64). These run with fully 64-bit kernels and userland. Running
 32-bit ARM binaries is also supported with `compat32`.
 
+evbarm variants are little endian unless otherwise stated. NetBSD provides
+big endian images primarily for testing purposes and to ensure that the code
+is endian-clean.
+
 ### armbsd.org builds
 
 NetBSD developer Jared McNeill provides [builds of NetBSD 9 and -current for a vast variety of hardware.](https://www.armbsd.org/)   In addition to the standard build, these images have board-specific U-Boot contents.  See also /usr/pkgsrc/sysutils/u-boot*.

more user relevant information
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:21:58 -0000	1.88
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:33:25 -0000	1.89
@@ -14,41 +14,35 @@
 changes_future="10.0"
 thumbnail="//www.netbsd.org/images/ports/evbarm/adi_brh.gif"
 about="""
-NetBSD/evbarm is the port of NetBSD to various evaluation and prototyping
-boards based on CPUs implementing the ARM architecture. NetBSD/evbarm also
-supports some specific embedded system products based on prototype board
-designs.
+NetBSD/evbarm is the port of NetBSD to various systems based on chips
+implementing the ARM architecture. The "evb" component is a reference
+to evaluation boards, the original target of the port, but this
+is no longer relevant - NetBSD/evbarm now runs on a range of
+hardware based on APCI or devicetrees, including a range of development
+boards, powerful servers, virtual machines, and even some laptops.
+"""
 
 ### CPU types
 
-The evbarm port can be built with a variety of CPU options, corresponding to the
-[large array of ARM CPU architectures](https://en.wikipedia.org/wiki/ARM_architecture#Cores).
-There are
-four main variables: the word size, the instruction set, the
-endianness, and whether there is hardware floating point.  By default
-the CPU type is "earm", and this implies aarch32 (32-bit), earmv5 cpu
-architecture, little endian (el when explicitly stated), and soft
-(Emulated) floating point.  Another example, suitable for Raspberry PI
-2, is earmv7hf, which is aarch32, the v7 instruction set, little
-endian, and hardware floating point.
-
-Typically, various boards are best compiled with a CPU type that
-matches the board's CPU and floating point support, but generally a
-lower CPU instruction set version is workable on a newer board.  See
-build.sh and look for aliases for the evbarm port.
-
-Through NetBSD 8, the evbarm port has supported exclusively the
-aarch32 (32-bit CPU) sub-family of the ARM architecture.  Some
-processors, such as many supporting the armv8 CPU architecture, also
-support a 64-bit instruction set, referred to as aarch64.  This is
-sometimes referred to as a distinct port, [[NetBSD/aarch64|aarch64]],
-with code in src/sys/arch/aarch64, but it is built as the evbarm port
-with aarch64 cpu type, and available as the alias evbarm64.
-
-Note that MACHINE_ARCH=aarch64 currently refers to the A64 instruction
-set and the aarch64 architecture, built for the armv8 architecture.
-(Note also that armv8 is the first architecture to support aarch64, so
-this will not be an issue until at least armv9.)
+Various CPU variants are supported, e.g:
+
+- evbarm-earmv6hf - ARMv6 with EABI and hardware floating point, e.g.
+  the original Raspberry Pi.
+- evbarm-earmv7hf - ARMv7 with EABI and hardware floating point, e.g.
+  most recent and common 32-bit ARM boards.
+- evbarm-earmv7hfeb - Same as the above, but with the CPU running in
+  big endian mode.
+- evbarm-aarch64 - 64-bit ARMv8
+- evbarm-aarch64eb - Same as the above, but with the CPU running in
+  big endian mode.
+
+evbarm variants are little endian unless otherwise stated. NetBSD provides
+big endian images primarily for testing purposes and to ensure that the code
+is endian-clean.
+
+Since NetBSD 9.0, 64-bit ARM processors are supported (referred to here
+as aarch64). These run with fully 64-bit kernels and userland. Running
+32-bit ARM binaries is also supported with `compat32`.
 
 ### armbsd.org builds
 

remove pre-fdt nonsense, update link to supported boards to a link that works
restructure page slightly to prioritize important information
Members: 
	ports/evbarm.mdwn:1.87->1.88 

Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- wikisrc/ports/evbarm.mdwn	15 Feb 2020 21:08:38 -0000	1.87
+++ wikisrc/ports/evbarm.mdwn	15 Sep 2020 07:21:58 -0000	1.88
@@ -50,23 +50,12 @@
 (Note also that armv8 is the first architecture to support aarch64, so
 this will not be an issue until at least armv9.)
 
-### QEMU
-
-See the [[NetBSD/evbarm under QEMU|qemu_arm]] page for instructions on how to get started with QEMU.
-
-### anita
-
-anita can be used to test builds.  (In addition to anita, install qemu and dtb-arm-vexpress from pkgsrc.)   The release subdirectory should follow the naming convention on the autobuild cluster, used below.
-
- - evbarm-earmv7hf uses "qemu-system-arm -M vexpress-a15"
- - evbarm-aarch64 uses "qemu-system-aarch64 -M virt"
- - Information on how to test emulated versions of other specific hardware is welcome.
-
 ### armbsd.org builds
 
 NetBSD developer Jared McNeill provides [builds of NetBSD 9 and -current for a vast variety of hardware.](https://www.armbsd.org/)   In addition to the standard build, these images have board-specific U-Boot contents.  See also /usr/pkgsrc/sysutils/u-boot*.
 
 ### Board specific information (often including installation information)
+
  - [[Allwinner sunxi family SoCs|Allwinner]]
  - [[BeagleBone, BeagleBone Black, and PocketBeagle|BeagleBone]]
  - [[NVIDIA Tegra|Tegra]]
@@ -75,303 +64,18 @@
  - [[RockChip SoCs|RockChip]]
  - [[Terasic DE0 Nano-SoC|Cyclone5]]
 
-### SSH configuration for installtion
-
-The default configuration will connect to the local network via DHCP and
-run an SSH server. In order to use the SSH server, we must configure
-users. This can be done by writing to the SD card's MS-DOS partition.
-
-Create a creds.txt file and use:
-
-           useradd user password
-
-<!--TODO: Additional configuration options are available on creds_msdos.8-->
-
-"""
-supported_hardware="""
-
-**NOTE**: This list is incomplete. For a full list of boards, please see the [GENERIC DTS files](http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/arch/evbarm/conf/GENERIC).
-
-[[!toc startlevel=3]]
-
-### ADI Engineering **BRH** ("Big Red Head")
-
-The BRH is an evaluation and development platform for the Intel **i80200**
-XScale processor. The BRH is based on ADI's **BECC** ("Big Endian Companion
-Chip"). The BRH is capable of both big- and little-endian operation, although
-NetBSD currently only supports little-endian operation.
-
-Support for the BRH was written by Jason Thorpe, and contributed by Wasabi
-Systems, Inc.
-
- * On-board NS16550-compatible serial ports (_com_)
- * On-board Intel i82559 Ethernet on the PCI bus (_fxp_)
- * On-chip timer on the BECC (used as system clock)
- * Other devices inserted into the PCI slot
-
-The BRH comes with 128M of SDRAM. Systems with BECC revision 7 or less are
-limited to 64M due to the layout of the PCI DMA windows. Users of these
-systems should obtain an FPGA upgrade from ADI to revision 8 or later of the
-BECC.
-
-### Allwinner Technology
-Various boards based on [[Allwinner]] SoCs are supported, including the BananaPi, Cubieboard 2, Cubietruck, Cubieboard 4, and Merrii Hummingbird A31.
-
-### Arcom **Viper**
-
-The Arcom Viper is a single board computer based on the PXA255 XScale
-processor.
-
-Support for the Arcom Viper was written by Antti Kantee.
-
- * On-chip timers (_saost_ used as system clock)
- * On-chip serial ports (_com_)
- * On-board SMC91C111 ethernet (_sm_)
-
-### ARM, Ltd. **Integrator**
-
-The Integrator/AP is an ATX form-factor board that is used for development of
-ARM processor-based designs. It supports up to four processors on plug-in core
-modules, and provides clocks, a bus interface, and interrupt support. The
-Integrator/AP also supports logic modules which provide additional
-peripherals, and can accommodate up to three PCI expansion cards. The
-Integrator/AP can also be inserted into a CompactPCI backplane.
-
-Support for the Integrator was written by Richard Earnshaw, and contributed by
-ARM, Ltd.
-
- * PrimeCell PL010 UARTs in the System Controller FPGA (_plcom_)
- * PrimeCell PL030 Real-time Clock in the System Controller FPGA (_plrtc_)
- * PrimeCell PL181 MultiMedia Card Interface
- * Other devices inserted into the PCI expansion slots
-
-### Atmark Techno **Armadillo-9**
-
-The Armadillo-9 is a single board computer based on the EP9315 processor.
-
-Support for the Armadillo-9 was written by Katsuomi Hamajima.
-
- * On-CPU RS232 UARTs (2) (_epcom_)
- * On-CPU 10/100 Ethernet MAC (_epe_)
- * system clock from on-CPU timers (_epclk_)
- * CompactFlash socket (_eppcic_)
- * USB 1.1 ports (_ohci_)
-
-### BeagleBoard.org **BeagleBoard** and **BeagleBoard-xM**
-The [[BeagleBoard]] is a low-power open-source hardware single-board computer from BeagleBoard.org.
-
-### BeagleBoard.org **BeagleBone** and **BeagleBone Black**
-The [[BeagleBone]] is a low-cost credit-card-sized computer from BeagleBoard.org.
-
-### Gumstix, Inc. **gumstix**
-
-The [gumstix](http://www.gumstix.com/) is a small form-factor motherboard
-based on the PXA255 and PXA270 XScale processor. Supports only PXA255 now.
-
-Support for the gumstix was written by KIYOHARA Takashi.
-
- * basix
- * cfstix
- * etherstix
- * netCF
- * netDUO
- * netDUO-mmc
- * netMMC
-
-When booting, it is necessary to set these with u-boot dynamically.
-
-<pre> > go 0xa0200000 busheader=basix</pre>
-
- * audiostix
- * console-st (waysmall - STUART)
- * console-hw (waysmall)
- * GPSstix (GPS not test)
- * tweener
-
-### Hardkernel ODROID-C1 and ODROID-C1+
+**NOTE**: This list is incomplete. For a full list of supported boards, please see the list of [32-bit](https://github.com/NetBSD/src/blob/netbsd-9/sys/arch/evbarm/conf/GENERIC#L18) and [64-bit](https://github.com/NetBSD/src/blob/netbsd-9/sys/arch/evbarm/conf/GENERIC64#L20) device trees.
 
-The [[ODROID-C1]] is a quad core Cortex-A5 small form-factor board from Hardkernel co., Ltd.
-
-### Intel **DBPXA250** ("Lubbock")
-
-DBPXA250 (a.k.a. Lubbock) is an evaluation and development platform for the
-Intel **PXA250** XScale Core application processor. More information about the **DBPXA250** can be found at [Intel website](http://www.intel.com/design/pca/applicationsprocessors/swsup/index.htm).
-
-Support for the **DBPXA250** was written by Hiroyuki Bessho, and contributed
-by Genetec Corp.
-
- * On-chip timers (_saost_ used as system clock)
- * On-chip 2 serial port (_com_)
- * On-board SMC91C96 ethernet (_sm_)
- * On-board SA-1111 StrongArm companion chip (_sacc_)
- * PS/2 keyboard (_pckbd_)
- * 640x480 LCD (_lcd_)
- * PCMCIA and CF card slots
-
-### Intel **IQ31244**
-
-The IQ31244 is a development platform for the Intel **IOP321** I/O Processor
-chipset and the Intel **i31244** SATA controller.
-
-Initial support for the IQ31244 was written by Jason Thorpe, and contributed
-by Wasabi Systems, Inc.
-
- * Quad on-board Intel i31244 SATA controllers on the PCI-X bus (_artsata_)
- * On-board Intel i82546EB Gigabit Ethernet on the PCI-X bus (_wm_)
- * On-board NS16550-compatible serial port (_com_)
- * On-chip timers (TMR0 used as system clock)
- * On-chip Application Accelerator Unit (_iopaau_)
- * On-chip watchdog timer (_iopwdog_)
- * On-board compact flash reader (_wdc_)
- * Other devices inserted into the PCI-X expansion slot
-
-### Intel **IQ80310**
-
-The IQ80310 is the reference platform for the Intel **IOP310** I/O Processor
-chipset, which is comprised of the i80200 XScale processor and the i80312 I/O
-Companion chip.
-
-Support for the IQ80310 was written by Jason Thorpe and Allen Briggs, and
-contributed by Wasabi Systems, Inc.
-

(Diff truncated)
Added a comment: Microsoft's Github disruptive policy changes
--- /dev/null	2020-09-12 04:41:03.835358348 +0000
+++ wikisrc/github/comment_1_c655c04964fb546397f626eac0de64f1._comment	2020-09-12 04:41:49.142130528 +0000
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://launchpad.net/~sigo"
+ nickname="sigo"
+ subject="Microsoft's Github disruptive policy changes"
+ date="2020-09-12T04:41:18Z"
+ content="""
+The day MS exerted control over Github, things went south there, and developers started to flee like hostages from the hub, and for good reason. Before long, MS had killed tons of accounts never ever stating any reasons, just as usual with M$, seemingly. Therefore, people quit github in droves even more so, and justifiedly so.
+
+Ever since, MS has hyperagressively enforced more disruptive policy changes against the userbase of github.com.
+
+Why NetBSD still plays the MS game, is beyond many open source enthusiasts. Do they enjoy this kind of abuse by the side of MS ?
+"""]]

spelling
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wikisrc/laptops.mdwn	11 Sep 2020 14:17:09 -0000	1.29
+++ wikisrc/laptops.mdwn	11 Sep 2020 14:22:10 -0000	1.30
@@ -204,7 +204,7 @@
 
 * Support for the display and HDMI output is provided through the Allwinner Display Engine driver.
   This provides kernel modesetting and a full-resolution video framebuffer, however,
-  the 3D acceleraiton features of the GPU are not yet accessible - Mesa llvmpipe is used instead.
+  the 3D acceleration features of the GPU are not yet accessible - Mesa llvmpipe is used instead.
 * The CPU frequency can be adjusted automatically with `estd` or with `sysctl machdep.cpufreq.*`.
 * [[!template id=man name="uvideo" section="4"]] webcam works.
 * External WiFI adapters can be used. Support for the internal WiFi - after WiFi system rework?
@@ -213,7 +213,7 @@
 
 * Support for the display output is provided through the Rockchip DRM driver.
   This provides kernel modesetting and a full-resolution video framebuffer, however,
-  the 3D acceleraiton features of the GPU are not yet accessible - Mesa llvmpipe is used instead.
+  the 3D acceleration features of the GPU are not yet accessible - Mesa llvmpipe is used instead.
   Currently, you can't connect external displays through USB-C.
 * The CPU frequency can be adjusted automatically with `estd` or with `sysctl machdep.cpufreq.*`.
 * [[!template id=man name="uvideo" section="4"]] webcam works.

drop outdated comments
--- wikisrc/laptops/comment_1_fa9af5f656b88b412cd222dbd25699ec._comment	2020-09-11 14:18:32.709745134 +0000
+++ /dev/null	2020-09-11 14:18:27.524272093 +0000
@@ -1,13 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawkfkxf7nWeKcwkYcONXDvwT0FqmS4jBSNw"
- nickname="Dmitry"
- subject="Packard bell bg47"
- date="2012-01-26T14:33:09Z"
- content="""
-Packard bell bg47
-
-Works: LAN, Wi-Fi, Card Reader
-Does not work: Sound, 3D
-
-Slow video performance
-"""]]
--- wikisrc/laptops/comment_2_ebe5cd9e5da672ed73b9fe1d69617472._comment	2020-09-11 14:18:32.740127275 +0000
+++ /dev/null	2020-09-11 14:18:27.524272093 +0000
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://me.yahoo.com/a/ceCmhGBukoQo3T2YQY9d06pQzt76i4Jp#a1439"
- nickname="Nigel"
- subject="Philips Freevents laptop"
- date="2015-12-16T22:13:38Z"
- content="""
-Works well up to and including NetBSD5.  NetBSD6 is slow, NetBSD7 is unusably slow when networking is enabled giving lots of \"sdmmc0: couldn't enable card: 60\" messages.  Disabling that driver in \"boot -c\" causes debugger breaking points in the mmc interrupt handler.
-"""]]
--- wikisrc/laptops/comment_3_52ce0d9b2841f0fc6acd97d66a5bf4a9._comment	2020-09-11 14:18:32.767063630 +0000
+++ /dev/null	2020-09-11 14:18:27.524272093 +0000
@@ -1,19 +0,0 @@
-[[!comment format=mdwn
- username="silasdb@0d2e694871d5a513ea916e0bd9c87d6ad7a6e29b"
- nickname="silasdb"
- subject="Lenovo ThinkPad T440"
- date="2016-03-25T23:13:27Z"
- content="""
-To install NetBSD from the USB images provided from the site, it is necessary to enable \"UEFI/Legacy Boot\" and to change the \"UEFI/Legacy Boot Priority\" to \"Legacy First\". Also, Enable the \"USB UEFI BIOS Support\" and disable \"USB 3.0 Mode\".
-
-After booting the USB image but before installing everything, you may want to switch back to MBR (instead of GPT).  To do this, drop to the shell prompt and delete GPT from the drives:
-
-    gpt destroy wd0
-    gpt destroy wd1
-
-What works: X11 (with new DRM/KMS work), audio, SSD and HDD, trackpoint, keyboard backlight (doesn't seem to depend on OS drivers). What doesn't work: onboard wireless (buy a cheap USB wireless adapter), suspend/hibernate/resume, special function keys (turn up/down volume, etc.).
-
-The new Synaptic Trackpad works with basic functions. Cursor movement and left click only.
-
-Tried with NetBSD 7.0.
-"""]]

correct model number
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/laptops.mdwn	11 Sep 2020 14:15:52 -0000	1.28
+++ wikisrc/laptops.mdwn	11 Sep 2020 14:17:09 -0000	1.29
@@ -176,7 +176,7 @@
 Supported | Supported | Supported | Supported | Supported | Supported | Supported
 """]]
 
-## EeePC 900
+## EeePC 901
 
 [[!table data="""
 GPU | WiFi | SD card reader | Ethernet | Audio | Webcam | Suspend/Resume

random restructuring
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/laptops.mdwn	11 Sep 2020 13:58:58 -0000	1.27
+++ wikisrc/laptops.mdwn	11 Sep 2020 14:15:52 -0000	1.28
@@ -123,14 +123,14 @@
 
 ## Thinkpad X230
 
-* Accelerated graphics with the i915 driver.
+* Accelerated graphics.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwn" section="4"]] driver.
 
 ## Thinkpad X250
 
-* Accelerated graphics with the i915 driver. Connecting externals displays
-  works with the miniDP and VGA ports.
+* Accelerated graphics.
+* Connecting externals displays works with the miniDP and VGA ports.
 * SD card reader is supported through the [[!template id=man name="rtsx" section="4"]] driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwm" section="4"]] driver.
@@ -147,11 +147,12 @@
 
 ## Thinkpad X260
 
-* Accelerated graphics with the i915 driver.
+* Accelerated graphics.
 * SD card reader is supported through the [[!template id=man name="rtsx" section="4"]] driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwm" section="4"]] driver.
 * Extra trackpoint buttons: run at least 9.0_STABLE for fixes to the Synaptics driver.
+* Webcam will depend on upcoming xhci isochronous pipe support.
 * Suspend and resume work.
 
 ---
@@ -201,21 +202,25 @@
 
 ## Pinebook (Allwinner A64)
 
+* Support for the display and HDMI output is provided through the Allwinner Display Engine driver.
+  This provides kernel modesetting and a full-resolution video framebuffer, however,
+  the 3D acceleraiton features of the GPU are not yet accessible - Mesa llvmpipe is used instead.
+* The CPU frequency can be adjusted automatically with `estd` or with `sysctl machdep.cpufreq.*`.
 * [[!template id=man name="uvideo" section="4"]] webcam works.
 * External WiFI adapters can be used. Support for the internal WiFi - after WiFi system rework?
-* Plugging in external monitors works via the HDMI port.
-* The CPU frequency can be adjusted with `sysctl machdep.cpufreq.*`.
-* Mesa llvmpipe is currently used for 3D/OpenGL.
 
 ## Pinebook Pro (Rockchip RK3399)
 
-* [[!template id=man name="uvideo" section="4"]] webcam works.
-* Internal Broadcom WiFi is supported via the [[!template id=man name="bwfm" section="4"]] driver in -current.
-  External adapters may still be more stable.
+* Support for the display output is provided through the Rockchip DRM driver.
+  This provides kernel modesetting and a full-resolution video framebuffer, however,
+  the 3D acceleraiton features of the GPU are not yet accessible - Mesa llvmpipe is used instead.
+  Currently, you can't connect external displays through USB-C.
 * The CPU frequency can be adjusted automatically with `estd` or with `sysctl machdep.cpufreq.*`.
+* [[!template id=man name="uvideo" section="4"]] webcam works.
+* External WiFI adapters can be used. Support for the internal WiFi - after WiFi system rework?
+  Internal Broadcom WiFi is supported via the [[!template id=man name="bwfm" section="4"]] driver in -current.
+  However, external adapters may still be more stable.
 * The display backlight can be adjusted with `sysctl`.
-* Mesa llvmpipe is currently used for 3D/OpenGL.
-* Connecting external monitors does not currently work through USB-C.
 
 ### Pinebook Pro CPU affinity
 

updates
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wikisrc/laptops.mdwn	7 Sep 2020 13:34:13 -0000	1.26
+++ wikisrc/laptops.mdwn	11 Sep 2020 13:58:58 -0000	1.27
@@ -2,9 +2,6 @@
 and portable computers that work well with NetBSD, are of interest
 to developers, and are standardized or easy to find.
 
-For i386-based netbooks also see
-<http://www.netbsd.org/ports/i386/netbook.html>.
-
 [[!toc ]]
 
 ---
@@ -103,13 +100,6 @@
 
 Works perfect (sound, display, all devices, infrared port not tested).
 
-## ThinkPad T61
-
-Used it since NetBSD 4.x.
-With Intel GMA, X works great.
-Cardbus port doesn't work properly.
-Expresscard not tested/tried.
-
 ## ThinkPad X60s
 
 Everything works.
@@ -117,25 +107,14 @@
 ## ThinkPad X41
 
 Works fine (sound, display, all devices, bluetooth, modem not tested).
-Standby is broken for me in -current (~2012-01-12) but worked in 5.1.
 
 ## ThinkPad X61s
 
 Everything works. Requires `PCI_BUS_FIXUP` and `PCI_ADDR_FIXUP` [[!template
 id=man name="options" section="4"]].
 
-## Thinkpad X201
-
-Running -current since March 2011.
-Working graphics (with the vesa driver), audio, trackpoint, wired
-and wireless LAN.
-Does not wake up after suspend (drives spin up but the display
-stays black and the LED indicating a sleep state stays lit).
-
 ## Thinkpad X220
 
-From user reports, in NetBSD 9.0:
-
 * Video acceleration works, but when using `xf86-video-intel` (the default),
   it's advisable to set `Option "AccelMethod"  "uxa"` in `xorg.conf`.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
@@ -144,45 +123,74 @@
 
 ## Thinkpad X230
 
-From user reports, in NetBSD 9.0:
-
 * Accelerated graphics with the i915 driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwn" section="4"]] driver.
 
 ## Thinkpad X250
 
-Nearly perfect. Running NetBSD 9.0 and -current since 2019.
-
 * Accelerated graphics with the i915 driver. Connecting externals displays
   works with the miniDP and VGA ports.
 * SD card reader is supported through the [[!template id=man name="rtsx" section="4"]] driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwm" section="4"]] driver.
-* For the extra trackpoint buttons to work correctly, needs a patch to
-  synaptics.c that is in -current and will be in 9.1.
-  Tapping and the clickpad have always been fine.
-* Brightness buttons do not work in 9 by default. You can bind them to
+* Extra trackpoint buttons: run at least 9.0_STABLE for fixes to the Synaptics driver.
+* Brightness buttons do not work in 9.0 by default. You can bind them to
   xrandr in your window manager.
 * Webcam will depend on upcoming xhci isochronous pipe support.
 * To record from the internal mic, set `mixerctl -w record.source=ADC02`
+* Some spam from [[!template id=man name="hdaudio" section="4"]] on some 
+  reboots, the chip doesn't seem to reset properly. Disappears and boots
+  normally after a few seconds.
+  [[!template id=pr number=51734]]
 * Suspend and resume work.
 
 ## Thinkpad X260
 
-From user reports, in NetBSD 9.0:
-
 * Accelerated graphics with the i915 driver.
 * SD card reader is supported through the [[!template id=man name="rtsx" section="4"]] driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwm" section="4"]] driver.
-* For the extra trackpoint buttons to work correctly, needs a patch to
-  synaptics.c that is in -current and will be in 9.1.
-  Tapping and the clickpad have always been fine.
+* Extra trackpoint buttons: run at least 9.0_STABLE for fixes to the Synaptics driver.
 * Suspend and resume work.
 
 ---
 
+# Asus
+
+Eee PCs were previously very popular hardware, so they're widely available
+cheaply, tend to work quite well, and what works is documented.
+
+## EeePC 701
+
+[[!table data="""
+GPU | WiFi | SD card reader | Ethernet | Audio | Webcam | Suspend/Resume
+Supported | Supported | Supported | Supported | Supported | Supported | Supported
+"""]]
+
+## EeePC 900
+
+[[!table data="""
+GPU | WiFi | SD card reader | Ethernet | Audio | Webcam | Suspend/Resume
+Supported | Supported | Supported | Supported | Supported | Supported | Supported
+"""]]
+
+## EeePC 900
+
+[[!table data="""
+GPU | WiFi | SD card reader | Ethernet | Audio | Webcam | Suspend/Resume
+Supported | Supported | Supported | Supported | Supported | Supported | Supported
+"""]]
+
+## EeePC 1000HA
+
+[[!table data="""
+GPU | WiFi | SD card reader | Ethernet | Audio | Webcam | Suspend/Resume
+Supported | Supported | Supported | Supported | Supported | Supported | Supported
+"""]]
+
+---
+
 # PINE64
 
 A number of NetBSD developers use Pinebooks to hack on NetBSD
@@ -193,8 +201,6 @@
 
 ## Pinebook (Allwinner A64)
 
-From user reports to port-arm@, in NetBSD 9.0:
-
 * [[!template id=man name="uvideo" section="4"]] webcam works.
 * External WiFI adapters can be used. Support for the internal WiFi - after WiFi system rework?
 * Plugging in external monitors works via the HDMI port.

Fix ISO and USB anchors in non-port_var cases.
Noticed by Rocky Hotas, thanks!
Members: 
	templates/port.mdwn:1.29->1.30 

Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wikisrc/templates/port.mdwn	25 Aug 2020 16:53:32 -0000	1.29
+++ wikisrc/templates/port.mdwn	10 Sep 2020 15:20:05 -0000	1.30
@@ -99,13 +99,13 @@
         </a>
       </li>
       <li>
-        <a title="NetBSD/<TMPL_VAR port> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>.iso">
+        <a title="NetBSD/<TMPL_VAR port> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>.iso">
           NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> ISO
         </a>
       </li>
       <TMPL_IF install_image>
         <li>
-          <a title="NetBSD/<TMPL_VAR port> USB image" href="https://cdn.NetBSD.org/pub/NetBSD/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR install_image>.img.gz">
+          <a title="NetBSD/<TMPL_VAR port> USB image" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR install_image>.img.gz">
             NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> USB image
           </a>
         </li>

Index: wikisrc/amazon_ec2.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/amazon_ec2.mdwn,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- wikisrc/amazon_ec2.mdwn	10 Oct 2019 14:33:12 -0000	1.55
+++ wikisrc/amazon_ec2.mdwn	10 Sep 2020 09:30:39 -0000	1.56
@@ -7,3 +7,4 @@
 * [Building your own NetBSD AMI - Xen PV](build_your_own_ami)
 * [Build instructions for NetBSD AMI with ENA support - HVM](http://www.netbsd.org/~ryoon/ena/how-to-create-ami-for-aws-c5.txt)
 * [NetBSD AMIs identifiers, by region](amis)
+* [Using bsdec2-image-upload to create an AMI](bsdec2_image_upload)

Use man template
Index: wikisrc/puffs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/puffs.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/puffs.mdwn	15 Mar 2013 22:02:32 -0000	1.3
+++ wikisrc/puffs.mdwn	9 Sep 2020 19:54:25 -0000	1.4
@@ -42,7 +42,7 @@
    of the native puffs interface, which is offered by **librefuse**. The
    re-implementation of the FUSE functionality is designed to be source code
    compatible with FUSE, and it is further described in the
-   [refuse(3)](http://netbsd.gw.com/cgi-bin/man-cgi?refuse+3+NetBSD-current+i386)
+   [[!template id=man name="refuse" section="3"]]
    manpage.
 
 Examples for puffs and refuse filesystems can be found in the the NetBSD source
@@ -67,7 +67,7 @@
 ### psshfs, The NetBSD sshfs
 
 See the manpage for
-[psshfs(8)](http://netbsd.gw.com/cgi-bin/man-cgi?mount_psshfs+8+NetBSD-5.1+i386).
+[[!template id=man name="mount_psshfs" section="8"]].
 
     # mount_psshfs host.name.tld:/directory /puffs
     # ls /puffs
@@ -94,7 +94,7 @@
 ### 9P file servers
 
 See the [Bell manpage](http://www.cs.bell-labs.com/sys/man/5/INDEX.html) and
-the [NetBSD manpage 9p(8)](http://netbsd.gw.com/cgi-bin/man-cgi?mount_9p+8+NetBSD-5.1+i386).
+the NetBSD manpage [[!template id=man name="mount_9p" section="8"]].
 
     # mount_9p nobody@192.168.1.2:/tmp /puffs
     # cd /puffs
@@ -165,7 +165,7 @@
 implementation of distributed file systems on top of puffs was presented at 
 AsiaBSDCon 2008.
 
-The [puffs(3)](http://man.NetBSD.org/man/puffs+3) manual pages provide further 
+The [[!template id=man name="puffs" section="3"]] manual pages provide further 
 information from a development perspective.
 
 The source code in browsable form:

Hardcode links to man.NetBSD.org yet another way
Use the linking syntax previously used:
- This is not how we want to link to manual pages; one should use
the man template ([[!template id=man ...]]) instead.
- We would rather not hardcode the scheme (http:) to NetBSD.org links,
unless the service only works with a specific scheme.
Members: 
	users/rkujawa/amigapci.mdwn:1.18->1.19 

Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:09:56 -0000	1.18
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:15:22 -0000	1.19
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]]</td>
+		<td>[[empb|http://man.NetBSD.org/amiga/empb.4]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]]</td>
+		<td>[[em4k|http://man.NetBSD.org/amiga/em4k.4]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
+		<td>[[p5pb|http://man.NetBSD.org/amiga/p5pb.4]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
+		<td>[[p5pb|http://man.NetBSD.org/amiga/p5pb.4]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]]*****</td>
+		<td>[[cv3dpb|http://man.NetBSD.org/amiga/cv3dpb.4]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+4.amiga+NetBSD-current]]</td>
+		<td>[[mppb|http://man.NetBSD.org/amiga/mppb.4]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne+4+NetBSD-current]]</td>
+		<td>[[ne|http://man.NetBSD.org/ne.4]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb+4+NetBSD-current]]</td>
+		<td>[[voodoofb|http://man.NetBSD.org/voodoofb.4]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink+4+NetBSD-current]]</td>
+		<td>[[satalink|http://man.NetBSD.org/satalink.4]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb+4+NetBSD-current]]</td>
+		<td>[[radeonfb|http://man.NetBSD.org/radeonfb.4]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb+4+NetBSD-current]]</td>
+		<td>[[genfb|http://man.NetBSD.org/genfb.4]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk+4+NetBSD-current]]</td>
+		<td>[[rtk|http://man.NetBSD.org/rtk.4]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Revert previous two: links did not work
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:08:08 -0000	1.17
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:09:56 -0000	1.18
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[empb](http://man.NetBSD.org/amiga/empb.4)</td>
+		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[em4k](http://man.NetBSD.org/amiga/em4k.4)</td>
+		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[p5pb](http://man.NetBSD.org/amiga/p5pb.4)</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[p5pb](http://man.NetBSD.org/amiga/p5pb.4)</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[cv3dpb](http://man.NetBSD.org/amiga/cv3dpb.4)*****</td>
+		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[mppb](http://man.NetBSD.org/amiga/mppb.4)</td>
+		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[ne](http://man.NetBSD.org/ne.4]]</td>
+		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne+4+NetBSD-current]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[voodoofb](http://man.NetBSD.org/voodoofb.4]]</td>
+		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb+4+NetBSD-current]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[satalink](http://man.NetBSD.org/satalink.4]]</td>
+		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink+4+NetBSD-current]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[radeonfb](http://man.NetBSD.org/radeonfb.4]]</td>
+		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb+4+NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[genfb](http://man.NetBSD.org/genfb.4]]</td>
+		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb+4+NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[rtk](http://man.NetBSD.org/rtk.4]]</td>
+		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk+4+NetBSD-current]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Stick in http: then
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:05:48 -0000	1.16
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:08:08 -0000	1.17
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[empb](//man.NetBSD.org/amiga/empb.4)</td>
+		<td>[empb](http://man.NetBSD.org/amiga/empb.4)</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[em4k](//man.NetBSD.org/amiga/em4k.4)</td>
+		<td>[em4k](http://man.NetBSD.org/amiga/em4k.4)</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[p5pb](//man.NetBSD.org/amiga/p5pb.4)</td>
+		<td>[p5pb](http://man.NetBSD.org/amiga/p5pb.4)</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[p5pb](//man.NetBSD.org/amiga/p5pb.4)</td>
+		<td>[p5pb](http://man.NetBSD.org/amiga/p5pb.4)</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[cv3dpb](//man.NetBSD.org/amiga/cv3dpb.4)*****</td>
+		<td>[cv3dpb](http://man.NetBSD.org/amiga/cv3dpb.4)*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[mppb](//man.NetBSD.org/amiga/mppb.4)</td>
+		<td>[mppb](http://man.NetBSD.org/amiga/mppb.4)</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[ne](//man.NetBSD.org/ne.4]]</td>
+		<td>[ne](http://man.NetBSD.org/ne.4]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[voodoofb](//man.NetBSD.org/voodoofb.4]]</td>
+		<td>[voodoofb](http://man.NetBSD.org/voodoofb.4]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[satalink](//man.NetBSD.org/satalink.4]]</td>
+		<td>[satalink](http://man.NetBSD.org/satalink.4]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[radeonfb](//man.NetBSD.org/radeonfb.4]]</td>
+		<td>[radeonfb](http://man.NetBSD.org/radeonfb.4]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[genfb](//man.NetBSD.org/genfb.4]]</td>
+		<td>[genfb](http://man.NetBSD.org/genfb.4]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[rtk](//man.NetBSD.org/rtk.4]]</td>
+		<td>[rtk](http://man.NetBSD.org/rtk.4]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Try different link markup for man.NetBSD.org links
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:52:45 -0000	1.15
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 17:05:48 -0000	1.16
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]]</td>
+		<td>[empb](//man.NetBSD.org/amiga/empb.4)</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]]</td>
+		<td>[em4k](//man.NetBSD.org/amiga/em4k.4)</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
+		<td>[p5pb](//man.NetBSD.org/amiga/p5pb.4)</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
+		<td>[p5pb](//man.NetBSD.org/amiga/p5pb.4)</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]]*****</td>
+		<td>[cv3dpb](//man.NetBSD.org/amiga/cv3dpb.4)*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+4.amiga+NetBSD-current]]</td>
+		<td>[mppb](//man.NetBSD.org/amiga/mppb.4)</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne+4+NetBSD-current]]</td>
+		<td>[ne](//man.NetBSD.org/ne.4]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb+4+NetBSD-current]]</td>
+		<td>[voodoofb](//man.NetBSD.org/voodoofb.4]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink+4+NetBSD-current]]</td>
+		<td>[satalink](//man.NetBSD.org/satalink.4]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb+4+NetBSD-current]]</td>
+		<td>[radeonfb](//man.NetBSD.org/radeonfb.4]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb+4+NetBSD-current]]</td>
+		<td>[genfb](//man.NetBSD.org/genfb.4]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk+4+NetBSD-current]]</td>
+		<td>[rtk](//man.NetBSD.org/rtk.4]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Revert prervious: links did not work
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:46:55 -0000	1.14
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:52:45 -0000	1.15
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[empb|//man.NetBSD.org/amiga/empb.4]]</td>
+		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[em4k|//man.NetBSD.org/amiga/em4k.4]]</td>
+		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[p5pb|//man.NetBSD.org/amiga/p5pb.4]]</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[p5pb|//man.NetBSD.org/amiga/p5pb.4]]</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[cv3dpb|//man.NetBSD.org/amiga/cv3dpb.4]]*****</td>
+		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[mppb|//man.NetBSD.org/amiga/mppb.4]]</td>
+		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[ne|//man.NetBSD.org/ne.4]]</td>
+		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne+4+NetBSD-current]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[voodoofb|//man.NetBSD.org/voodoofb.4]]</td>
+		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb+4+NetBSD-current]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[satalink|//man.NetBSD.org/satalink.4]]</td>
+		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink+4+NetBSD-current]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[radeonfb|//man.NetBSD.org/radeonfb.4]]</td>
+		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb+4+NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[genfb|//man.NetBSD.org/genfb.4]]</td>
+		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb+4+NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[rtk|//man.NetBSD.org/rtk.4]]</td>
+		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk+4+NetBSD-current]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Hard-code links to man.NetBSD.org as man template does not work here
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:41:08 -0000	1.13
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:46:55 -0000	1.14
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]]</td>
+		<td>[[empb|//man.NetBSD.org/amiga/empb.4]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]]</td>
+		<td>[[em4k|//man.NetBSD.org/amiga/em4k.4]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
+		<td>[[p5pb|//man.NetBSD.org/amiga/p5pb.4]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
+		<td>[[p5pb|//man.NetBSD.org/amiga/p5pb.4]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]]*****</td>
+		<td>[[cv3dpb|//man.NetBSD.org/amiga/cv3dpb.4]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+4.amiga+NetBSD-current]]</td>
+		<td>[[mppb|//man.NetBSD.org/amiga/mppb.4]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne+4+NetBSD-current]]</td>
+		<td>[[ne|//man.NetBSD.org/ne.4]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb+4+NetBSD-current]]</td>
+		<td>[[voodoofb|//man.NetBSD.org/voodoofb.4]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink+4+NetBSD-current]]</td>
+		<td>[[satalink|//man.NetBSD.org/satalink.4]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb+4+NetBSD-current]]</td>
+		<td>[[radeonfb|//man.NetBSD.org/radeonfb.4]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb+4+NetBSD-current]]</td>
+		<td>[[genfb|//man.NetBSD.org/genfb.4]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk+4+NetBSD-current]]</td>
+		<td>[[rtk|//man.NetBSD.org/rtk.4]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Add section to all manual page links (all are 4)
- Note: radeonfb(4) does not exist
Members: 
	users/rkujawa/amigapci.mdwn:1.12->1.13 

Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:38:41 -0000	1.12
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:41:08 -0000	1.13
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+.amiga+NetBSD-current]]</td>
+		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+.amiga+NetBSD-current]]</td>
+		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]]</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]]</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+.amiga+NetBSD-current]]*****</td>
+		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+.amiga+NetBSD-current]]</td>
+		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+4.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne++NetBSD-current]]</td>
+		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne+4+NetBSD-current]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb++NetBSD-current]]</td>
+		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb+4+NetBSD-current]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink++NetBSD-current]]</td>
+		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink+4+NetBSD-current]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb++NetBSD-current]]</td>
+		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb+4+NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb++NetBSD-current]]</td>
+		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb+4+NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk++NetBSD-current]]</td>
+		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk+4+NetBSD-current]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Revert: looks like templates do not work inside tables created using HTML
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:20:21 -0000	1.11
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:38:41 -0000	1.12
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[!template id=man name="empb" section="4" arch="amiga"]]</td>
+		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[!template id=man name="em4k" section="4" arch="amiga"]]</td>
+		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[!template id=man name="p5pb" section="4" arch="amiga"]]</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[!template id=man name="p5pb" section="4" arch="amiga"]]</td>
+		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[!template id=man name="cv3dpb" section="4" arch="amiga"]]*****</td>
+		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+.amiga+NetBSD-current]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[!template id=man name="mppb" section="4" arch="amiga"]]</td>
+		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+.amiga+NetBSD-current]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[!template id=man name="ne" section="4"]]</td>
+		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne++NetBSD-current]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[!template id=man name="voodoofb" section="4"]]</td>
+		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb++NetBSD-current]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[!template id=man name="satalink" section="4"]]</td>
+		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink++NetBSD-current]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[!template id=man name="radeonfb" section="4"]]</td>
+		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb++NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[!template id=man name="genfb" section="4"]]</td>
+		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb++NetBSD-current]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[!template id=man name="rtk" section="4"]]</td>
+		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk++NetBSD-current]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>

Use man template
Index: wikisrc/users/rkujawa.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa.mdwn,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wikisrc/users/rkujawa.mdwn	21 Jun 2018 12:53:02 -0000	1.41
+++ wikisrc/users/rkujawa.mdwn	9 Sep 2020 16:20:21 -0000	1.42
@@ -6,27 +6,27 @@
 
 ## Completed projects 
 
-* [[bppcsc|http://netbsd.gw.com/cgi-bin/man-cgi?bppcsc+.amiga+NetBSD-current]] - Phase5 BlizzardPPC 603e+ SCSI host adapter driver.
+* [[!template id=man name="bppcsc" section="4" arch="amiga"]] - Phase5 BlizzardPPC 603e+ SCSI host adapter driver.
 * PCI bus support for amiga(ppc) ports.
-* [[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]] - Phase5 BlizzardVisionPPC/CyberVisionPPC and DCE G-REX PCI bridge driver.
-* [[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+.amiga+NetBSD-current]] - Matay Prometheus PCI bridge driver.
-* [[efa|http://netbsd.gw.com/cgi-bin/man-cgi?efa+4.amiga+NetBSD-current]] - ELBOX FastATA 1200 Mk-III/Mk-IV driver.
-* [[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+4.amiga+NetBSD-current]] - Phase5 CyberVision 64/3D PCI bridge driver.
-* [[clockport|http://netbsd.gw.com/cgi-bin/man-cgi?clockport+4.amiga+NetBSD-current]], [[a1k2cp|http://netbsd.gw.com/cgi-bin/man-cgi?a1k2cp+4.amiga+NetBSD-current]], [[gencp|http://netbsd.gw.com/cgi-bin/man-cgi?gencp+4.amiga+NetBSD-current]] - Clockport support layer, A1200 on-board clockport backend driver, generic clockport driver.
-* [[xsurf|http://netbsd.gw.com/cgi-bin/man-cgi?xsurf+4.amiga+NetBSD-current]] - Reworked driver for the Individual Computers X-Surf ethernet card, featuring clockport and IDE support.
-* [[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+4.amiga+NetBSD-current]] - ELBOX Mediator PCI 1200 bridge driver (with Frank Wille).
-* [[tdvfb|http://netbsd.gw.com/cgi-bin/man-cgi?tdvfb+4+NetBSD-current]] - 3Dfx Voodoo Graphics / Voodoo 2 framebuffer driver.
-* [[msm6242b|http://netbsd.gw.com/cgi-bin/man-cgi?msm6242b+4+NetBSD-current]] - OKI MSM6242B RTC driver.
-* [[z3rambd|http://netbsd.gw.com/cgi-bin/man-cgi?z3rambd+4.amiga+NetBSD-current]] - Zorro III RAM block device driver. 
+* [[!template id=man name="p5pb" section="4" arch="amiga"]] - Phase5 BlizzardVisionPPC/CyberVisionPPC and DCE G-REX PCI bridge driver.
+* [[!template id=man name="mppb" section="4" arch="amiga"]] - Matay Prometheus PCI bridge driver.
+* [[!template id=man name="efa" section="4" arch="amiga"]] - ELBOX FastATA 1200 Mk-III/Mk-IV driver.
+* [[!template id=man name="cv3dpb" section="4" arch="amiga"]] - Phase5 CyberVision 64/3D PCI bridge driver.
+* [[!template id=man name="clockport" section="4" arch="amiga"]], [[!template id=man name="a1k2cp" section="4" arch="amiga"]], [[!template id=man name="gencp" section="4" arch="amiga"]] - Clockport support layer, A1200 on-board clockport backend driver, generic clockport driver.
+* [[!template id=man name="xsurf" section="4" arch="amiga"]] - Reworked driver for the Individual Computers X-Surf ethernet card, featuring clockport and IDE support.
+* [[!template id=man name="empb" section="4" arch="amiga"]] - ELBOX Mediator PCI 1200 bridge driver (with Frank Wille).
+* [[!template id=man name="tdvfb" section="4"]] - 3Dfx Voodoo Graphics / Voodoo 2 framebuffer driver.
+* [[!template id=man name="msm6242b" section="4"]] - OKI MSM6242B RTC driver.
+* [[!template id=man name="z3rambd" section="4" arch="amiga"]] - Zorro III RAM block device driver. 
 * [[empm]] - ELBOX Mediator 1200 TX/SX power management driver.
-* [[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+4.amiga+NetBSD-current]] - ELBOX Mediator 4000 PCI bridge driver.
-* [[tps65217pmic|http://netbsd.gw.com/cgi-bin/man-cgi?tps65217pmic++NetBSD-current]] - Texas Instruments TPS65217 Power Management IC driver (as found on BeagleBone and BealgeBone Black).
-* [[slhci_zbus]] - Zorro attachment code for the [[slhci|http://netbsd.gw.com/cgi-bin/man-cgi?slhci++NetBSD-current]] driver. Supports Thylacine USB HCI card.
-* [[mcp980x|http://netbsd.gw.com/cgi-bin/man-cgi?mcp980x++NetBSD-current]] - Microchip MCP9800/1/2/3 I2C temperature sensor driver.
+* [[!template id=man name="em4k" section="4" arch="amiga"]] - ELBOX Mediator 4000 PCI bridge driver.
+* [[!template id=man name="tps65217pmic" section="4"]] - Texas Instruments TPS65217 Power Management IC driver (as found on BeagleBone and BealgeBone Black).
+* [[slhci_zbus]] - Zorro attachment code for the [[!template id=man name="slhci" section="4"]] driver. Supports Thylacine USB HCI card.
+* [[!template id=man name="mcp980x" section="4"]] - Microchip MCP9800/1/2/3 I2C temperature sensor driver.
 * Integration of [[Semihalf's|http://semihalf.com/]] NetBSD port to [[Marvell Armada XP|http://www.marvell.com/embedded-processors/armada-xp/]].
-* [[xsh|http://netbsd.gw.com/cgi-bin/man-cgi?xsh+4.amiga+NetBSD-current]] - Driver for the Individual Computers X-Surf 100 ethernet card.
-* [[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.
+* [[!template id=man name="xsh" section="4" arch="amiga"]] - Driver for the Individual Computers X-Surf 100 ethernet card.
+* [[!template id=man name="mpl115a" section="4"]] - Freescale MPL115A2 pressure sensor driver.
+* [[!template id=man name="acafh" section="4" arch="amiga"]] - Individual Computers ACA500 driver.
 * mcp48x1dac - Microchip MCP48x1 series DAC driver.
 * 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.
 
@@ -53,7 +53,7 @@
 
 # Other software
 
-* [[wsdv|https://github.com/rkujawa/wsdv]] - simple picture viewer for [[wsdisplay(4)|http://netbsd.gw.com/cgi-bin/man-cgi?wsdisplay++NetBSD-current]] (very rought prototype).
+* [[wsdv|https://github.com/rkujawa/wsdv]] - simple picture viewer for [[!template id=man name="wsdisplay" section="4"]] (very rought prototype).
 * [[Various projects at GitHub|https://github.com/rkujawa?tab=repositories]]
 
 # Movies on YouTube 
Index: wikisrc/users/rkujawa/amigapci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/amigapci.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/users/rkujawa/amigapci.mdwn	30 Jan 2013 20:31:17 -0000	1.10
+++ wikisrc/users/rkujawa/amigapci.mdwn	9 Sep 2020 16:20:21 -0000	1.11
@@ -14,14 +14,14 @@
 	</tr>
 	<tr>
 		<td>Elbox Mediator 1200</td>
-		<td>[[empb|http://netbsd.gw.com/cgi-bin/man-cgi?empb+.amiga+NetBSD-current]]</td>
+		<td>[[!template id=man name="empb" section="4" arch="amiga"]]</td>
 		<td>yes</td>
 		<td>yes**</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Elbox Mediator 4000</td>
-		<td>[[em4k|http://netbsd.gw.com/cgi-bin/man-cgi?em4k+.amiga+NetBSD-current]]</td>
+		<td>[[!template id=man name="em4k" section="4" arch="amiga"]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -35,28 +35,28 @@
 	</tr>
 	<tr>
 		<td>DCE G-REX 1200 / 4000</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]]</td>
+		<td>[[!template id=man name="p5pb" section="4" arch="amiga"]]</td>
 		<td>yes</td>
 		<td>yes***</td>
 		<td>no****</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVisionPPC/BVisionPPC</td>
-		<td>[[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+.amiga+NetBSD-current]]</td>
+		<td>[[!template id=man name="p5pb" section="4" arch="amiga"]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Phase5 CyberVision64/3D</td>
-		<td>[[cv3dpb|http://netbsd.gw.com/cgi-bin/man-cgi?cv3dpb+.amiga+NetBSD-current]]*****</td>
+		<td>[[!template id=man name="cv3dpb" section="4" arch="amiga"]]*****</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
 	</tr>
 	<tr>
 		<td>Matay Prometheus</td>
-		<td>[[mppb|http://netbsd.gw.com/cgi-bin/man-cgi?mppb+.amiga+NetBSD-current]]</td>
+		<td>[[!template id=man name="mppb" section="4" arch="amiga"]]</td>
 		<td>yes</td>
 		<td>yes</td>
 		<td>no</td>
@@ -84,37 +84,37 @@
 	<tr>
 	<tr>
 		<td>NE2000 network cards (like RTL8029)</td>
-		<td>[[ne|http://netbsd.gw.com/cgi-bin/man-cgi?ne++NetBSD-current]]</td>
+		<td>[[!template id=man name="ne" section="4"]]</td>
 		<td>empb, p5pb, mppb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>3Dfx Voodoo3</td>
-		<td>[[voodoofb|http://netbsd.gw.com/cgi-bin/man-cgi?voodoofb++NetBSD-current]]</td>
+		<td>[[!template id=man name="voodoofb" section="4"]]</td>
 		<td>empb, p5pb</td>
 		<td>yes*</td>
 	</tr>
 	<tr>
 		<td>SATALink 3112</td>
-		<td>[[satalink|http://netbsd.gw.com/cgi-bin/man-cgi?satalink++NetBSD-current]]</td>
+		<td>[[!template id=man name="satalink" section="4"]]</td>
 		<td>empb</td>
 		<td>yes</td>
 	</tr>
 	<tr>
 		<td>ATI Radeon R200</td>
-		<td>[[radeonfb|http://netbsd.gw.com/cgi-bin/man-cgi?radeonfb++NetBSD-current]]</td>
+		<td>[[!template id=man name="radeonfb" section="4"]]</td>
 		<td>p5pb</td>
 		<td>not yet, work in progress</td>
 	</tr>
 	<tr>
 		<td>TI TVP4020 Permedia 2</td>
-		<td>[[genfb|http://netbsd.gw.com/cgi-bin/man-cgi?genfb++NetBSD-current]]</td>
+		<td>[[!template id=man name="genfb" section="4"]]</td>
 		<td>p5pb</td>
 		<td>yes**</td>
 	</tr>
 	<tr>
 		<td>Realtek 8139</td>
-		<td>[[rtk|http://netbsd.gw.com/cgi-bin/man-cgi?rtk++NetBSD-current]]</td>
+		<td>[[!template id=man name="rtk" section="4"]]</td>
 		<td>p5pb, empb</td>
 		<td>no, needs DMA</td>
 	</tr>
Index: wikisrc/users/rkujawa/g-rex.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/rkujawa/g-rex.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/rkujawa/g-rex.mdwn	12 Jul 2012 17:04:33 -0000	1.12
+++ wikisrc/users/rkujawa/g-rex.mdwn	9 Sep 2020 16:20:21 -0000	1.13
@@ -191,7 +191,7 @@
 
 # 7. Sample PCI bridge driver implementation
 
-The NetBSD [[p5pb|http://netbsd.gw.com/cgi-bin/man-cgi?p5pb+4.amiga+NetBSD-current]] 
+The NetBSD [[!template id=man name="p5pb" section="4" arch="amiga"]] 
 driver serves as an example driver implementation. It was written using the 
 same knowledge that went into this document.
 

Use man template
Index: wikisrc/pkgsrc/how_to_install_a_mysql_server.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/how_to_install_a_mysql_server.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/pkgsrc/how_to_install_a_mysql_server.mdwn	6 Aug 2018 21:25:05 -0000	1.3
+++ wikisrc/pkgsrc/how_to_install_a_mysql_server.mdwn	9 Sep 2020 15:50:14 -0000	1.4
@@ -22,7 +22,7 @@
     # cp /usr/pkg/share/examples/rc.d/mysqld /etc/rc.d/
     
 
-and start the MySQL server via the NetBSD's [rc.d(8)](http://netbsd.gw.com/cgi-bin/man-cgi?rc.d+8+NetBSD-current) framework. Only one modification is needed to [rc.conf(5)](http://netbsd.gw.com/cgi-bin/man-cgi?rc.conf+5+NetBSD-current): 
+and start the MySQL server via the NetBSD's [[!template id=man name="rc.d" section="8"]] framework. Only one modification is needed to [[!template id=man name="rc.conf" section="5"]]: 
     
 
 # echo "mysqld=yes" >> /etc/rc.conf
Index: wikisrc/pkgsrc/how_to_install_a_postgresql_server.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/how_to_install_a_postgresql_server.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/pkgsrc/how_to_install_a_postgresql_server.mdwn	4 Jul 2016 05:35:17 -0000	1.4
+++ wikisrc/pkgsrc/how_to_install_a_postgresql_server.mdwn	9 Sep 2020 15:50:14 -0000	1.5
@@ -108,5 +108,5 @@
 
 #   Additional Information 
 
-  * [pkg_add(1)](http://netbsd.gw.com/cgi-bin/man-cgi?pkg_add+1+NetBSD-current) Manpage 
-  * [su(1)](http://netbsd.gw.com/cgi-bin/man-cgi?su+1+NetBSD-current) Manpage 
+  * [[!template id=man name="pkg_add" section="1"]] Manpage 
+  * [[!template id=man name="su" section="1"]] Manpage 
Index: wikisrc/pkgsrc/how_to_upgrade_packages.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/how_to_upgrade_packages.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/pkgsrc/how_to_upgrade_packages.mdwn	31 Aug 2020 18:11:49 -0000	1.8
+++ wikisrc/pkgsrc/how_to_upgrade_packages.mdwn	9 Sep 2020 15:50:14 -0000	1.9
@@ -28,7 +28,7 @@
 
 By using the -uu (option used twice), it will attempt to update prerequisite packages also.
 
-See the manual page, [pkg_add(1)](http://netbsd.gw.com/cgi-bin/man-cgi?pkg_add+1+NetBSD-current), for details.
+See the manual page, [[!template id=man name="pkg_add" section="1"]], for details.
 
 
 ## pkg_chk -b

Use man template
Index: wikisrc/users/mbalmer/keylock.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/mbalmer/keylock.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/mbalmer/keylock.mdwn	29 Dec 2009 09:31:15 -0000	1.6
+++ wikisrc/users/mbalmer/keylock.mdwn	9 Sep 2020 15:47:01 -0000	1.7
@@ -18,13 +18,13 @@
 
 The following components have been added:
 
-* <b>[gpiolock(4)](http://netbsd.gw.com/cgi-bin/man-cgi?gpiolock+4+NetBSD-current)</b>
+* <b>[[!template id=man name="gpiolock" section="4"]]</b>
 a driver for GPIO attached keylocks.
  The driver registers with the in-kernel keylock "subsystem". See
 [gpiolock.c](http://cvsweb.de.netbsd.org/cgi-bin/cvsweb.cgi/src/sys/dev/gpio/gpiolock.c?rev=HEAD).
 
 * <b>secmodel_keylock</b>, a
-[kauth(9)](http://netbsd.gw.com/cgi-bin/man-cgi?kauth+9+NetBSD-current)
+[[!template id=man name="kauth" section="9"]]
 security model that
 authorizes based on the keylock "closedness".  Wheter the rightmost
 (default) or leftmost position of the keylock means open can be
@@ -52,7 +52,7 @@
 show what makes sense in the end).
 
 To enable the keylock support, the keylock security model, and the
-[gpiolock(4)](http://netbsd.gw.com/cgi-bin/man-cgi?gpiolock+4+NetBSD-current)
+[[!template id=man name="gpiolock" section="4"]]
 driver, add the following lines to your
 kernel configuration file:
 
@@ -61,7 +61,7 @@
 	gpiolock* at gpio?
 
 Of course you must have at least one GPIO device in your system for the
-[gpiolock(4)](http://netbsd.gw.com/cgi-bin/man-cgi?gpiolock+4+NetBSD-current)
+[[!template id=man name="gpiolock" section="4"]]
 driver to work and the lock must be
 connected properly.
 

Use man template
Index: wikisrc/puffs/kernel_file_systems_as_userspace_servers.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/puffs/kernel_file_systems_as_userspace_servers.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/puffs/kernel_file_systems_as_userspace_servers.mdwn	15 Mar 2013 22:02:32 -0000	1.2
+++ wikisrc/puffs/kernel_file_systems_as_userspace_servers.mdwn	9 Sep 2020 15:44:50 -0000	1.3
@@ -42,7 +42,7 @@
 instance, the equivalent of `mount_msdos` is `rump_msdos`.  The usage is also 
 equal, so the manual page of the mount equivalent should be consulted. The only 
 exception is that rump file systems do not require the use of
-[vnconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?vnconfig+8+NetBSD-current+i386)
+[[!template id=man name="vnconfig" section="8"]]
 to mount regular files. Rather, such images can be mounted directly by using the 
 image as the device file path.
 

Use man template
Index: wikisrc/examples/elf_executables_for_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/examples/elf_executables_for_powerpc.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/examples/elf_executables_for_powerpc.mdwn	5 Feb 2012 07:14:36 -0000	1.2
+++ wikisrc/examples/elf_executables_for_powerpc.mdwn	9 Sep 2020 15:42:48 -0000	1.3
@@ -15,7 +15,7 @@
 
 #   A very simple C program 
 
-This program is only one C file, which contains only one main function, which calls [printf(3)](http://netbsd.gw.com/cgi-bin/man-cgi?printf+3+NetBSD-current) to print a single message, then returns 0 as the exit status. 
+This program is only one C file, which contains only one main function, which calls [[!template id=man name="printf" section="3"]] to print a single message, then returns 0 as the exit status. 
     
 
 
@@ -29,10 +29,10 @@
     }
     
 
-The C compiler _gcc_ likes to use its knowledge of builtin functions to manipulate code. The version of gcc in NetBSD 4.0.1/macppc will simplify the printf statement to puts("Greeting, Earth!"); so the main function effectively calls [puts(3)](http://netbsd.gw.com/cgi-bin/man-cgi?puts+3+NetBSD-current) once and then returns 0. 
+The C compiler _gcc_ likes to use its knowledge of builtin functions to manipulate code. The version of gcc in NetBSD 4.0.1/macppc will simplify the printf statement to puts("Greeting, Earth!"); so the main function effectively calls [[!template id=man name="puts" section="3"]] once and then returns 0. 
 
 
-We can apply [gcc(1)](http://netbsd.gw.com/cgi-bin/man-cgi?gcc+1+NetBSD-current) in the usual way to compile this program. (With NetBSD, _cc_ or _gcc_ invokes the same command, so we use either name.) Then we can run our program: 
+We can apply [[!template id=man name="gcc" section="1"]] in the usual way to compile this program. (With NetBSD, _cc_ or _gcc_ invokes the same command, so we use either name.) Then we can run our program: 
     
 
 $ cc -o greetings greetings.c
@@ -77,7 +77,7 @@
 
 #   The program in PowerPC assembly language 
 
-The manual page for [gcc(1)](http://netbsd.gw.com/cgi-bin/man-cgi?gcc+1+NetBSD-current) explains that we can use the _-S_ option to stop gcc with the assembly code. For PowerPC targets, gcc outputs register numbers by default; the _-mregnames_ option tells gcc to output register names instead. If you are learning assembly language, then _cc -mregnames -S_ is a good way to produce examples of assembly code. 
+The manual page for [[!template id=man name="gcc" section="1"]] explains that we can use the _-S_ option to stop gcc with the assembly code. For PowerPC targets, gcc outputs register numbers by default; the _-mregnames_ option tells gcc to output register names instead. If you are learning assembly language, then _cc -mregnames -S_ is a good way to produce examples of assembly code. 
 
 
 The command _cc -mregnames -S greetings.c_ produces the output file _greetings.s_ which contains the assembly version of our main function. (If you want _greeting.s_ to contain PowerPC assembly code, then you need to use compiler that targets PowerPC.) The assembly syntax allows for comments, assembler directives, instructions and labels. 
@@ -205,7 +205,7 @@
     	.ident	"GCC: (GNU) 4.1.2 20061021 prerelease (NetBSD nb3 20061125)"
     
 
-The above code is not a complete, standalone assembly program! It only contains a main function, for linking with the C runtime and the C library. It obeys the ELF and PowerPC conventions for the use of registers. (These conventions require the code to save r31 but not r9.) The _bl puts_ instruction is our evidence that the program calls [puts(3)](http://netbsd.gw.com/cgi-bin/man-cgi?puts+3+NetBSD-current) instead of [printf(3)](http://netbsd.gw.com/cgi-bin/man-cgi?printf+3+NetBSD-current). 
+The above code is not a complete, standalone assembly program! It only contains a main function, for linking with the C runtime and the C library. It obeys the ELF and PowerPC conventions for the use of registers. (These conventions require the code to save r31 but not r9.) The _bl puts_ instruction is our evidence that the program calls [[!template id=man name="puts" section="3"]] instead of [[!template id=man name="printf" section="3"]]. 
 
 
 The compiler did not optimize the above code. Some optimizations might be obvious! Consider the code that saves argc and argv to the stack. We would can use r1 instead of copying r1 to r11. Going further, we would can delete the code and never save argc and argv, because this main function never uses argc and argv! 
@@ -278,14 +278,14 @@
   1. The first step is to run the assembler (as), which translates the assembly code to machine code, and stores the machine code in an ELF relocatable object. 
   2. The second step is to run the linker (ld), which combines some ELF relocatables into one ELF executable. 
 
-There are various tools that can examine ELF files. The command [nm(1)](http://netbsd.gw.com/cgi-bin/man-cgi?nm+1+NetBSD-current) lists the global symbols in an object file. The commands [objdump(1)](http://netbsd.gw.com/cgi-bin/man-cgi?objdump+1+NetBSD-current) and [readelf(1)](http://netbsd.gw.com/cgi-bin/man-cgi?readelf+1+NetBSD-current) show other information. These commands can examine both relocatables and executables. Though the executable is more interesting, the relocatable is simpler. 
+There are various tools that can examine ELF files. The command [[!template id=man name="nm" section="1"]] lists the global symbols in an object file. The commands [[!template id=man name="objdump" section="1"]] and [[!template id=man name="readelf" section="1"]] show other information. These commands can examine both relocatables and executables. Though the executable is more interesting, the relocatable is simpler. 
 
 To continue our example, we can run the assembler with _greetings.s_ to produce _greetings.o_. We use the optimized code in _greetings.s_ from _cc -O2 -mregnames -S greetings.c_, because it was shorter. We feed our file _greeting.s_ to /usr/bin/as with a simple command. 
     
     $ as -o greetings.o greetings.s
     
 
-The output _greetings.o_ is a relocatable object file, and [file(1)](http://netbsd.gw.com/cgi-bin/man-cgi?file+1+NetBSD-current) confirms this. 
+The output _greetings.o_ is a relocatable object file, and [[!template id=man name="file" section="1"]] confirms this. 
     
 $ file greetings.o
     greetings.o: ELF 32-bit MSB relocatable, PowerPC or cisco 4500, version 1 (SYSV)
@@ -323,7 +323,7 @@
 
 This command verifies the presence of the _.text_ and _.rodata.str1.4_ sections. The _.text_ section begins at file offset 0x34 and has size 0x2c, in bytes. The _.rodata.str1.4_ section begins at file offset 0x60 and has size 0x14. 
 
-Because the source _greetings.s_ does not have assembler directives for the _.data_ or _.bss_ or _.comment_ section, there must be another explanation for those three sections. The _.data_ and _.bss_ section has size 0x0. Perhaps for traditional reasons, the assembler puts these sections into every object file. Because the source _greeting.s_ never mentioned the _.data_ or _.bss_ section, nor allocated space in them, so the assembler output them as empty sections. (The [a.out(5)](http://netbsd.gw.com/cgi-bin/man-cgi?a.out+5+NetBSD-current) format always had text, data and bss segments. The [elf(5)](http://netbsd.gw.com/cgi-bin/man-cgi?elf+5+NetBSD-current) format distinguishes segments and sections, and also allows for arbitrary sections like _.rodata.str1.4_ and _.comment_.) 
+Because the source _greetings.s_ does not have assembler directives for the _.data_ or _.bss_ or _.comment_ section, there must be another explanation for those three sections. The _.data_ and _.bss_ section has size 0x0. Perhaps for traditional reasons, the assembler puts these sections into every object file. Because the source _greeting.s_ never mentioned the _.data_ or _.bss_ section, nor allocated space in them, so the assembler output them as empty sections. (The [[!template id=man name="a.out" section="5"]] format always had text, data and bss segments. The [[!template id=man name="elf" section="5"]] format distinguishes segments and sections, and also allows for arbitrary sections like _.rodata.str1.4_ and _.comment_.) 
 
 
 That leaves the mystery of the _.comment_ section. The _objdump_ command accepts _-j_ to select a section and _-s_ to show the contents, so _objdump -j .comment -s greetings.o_ dumps the 0x3c bytes in that section. 

Use man template
Index: wikisrc/ports/hpcmips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hpcmips.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/ports/hpcmips.mdwn	29 Feb 2020 21:17:35 -0000	1.24
+++ wikisrc/ports/hpcmips.mdwn	9 Sep 2020 15:37:52 -0000	1.25
@@ -45,7 +45,7 @@
 * Boot in single user mode.
 * Press keys and note the KeyScanCode's.
 * Fill vr/vrkiu.c default_keytrans[] with scancode, dev/pckbc/wskbdmap_mfii.c:pckbd_keydesc_us[] is KeyCodeMapping.
-* Send feedback with your results using [send-pr(1)](http://netbsd.gw.com/cgi-bin/man-cgi/man?send-pr+1) (port-hpcmips category).
+* Send feedback with your results using [[!template id=man name="send-pr" section="1"]] (port-hpcmips category).
 * [Keymap information](keymap.txt) is here</a>.
 
 """
Index: wikisrc/ports/news68k.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/news68k.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/ports/news68k.mdwn	15 Feb 2020 08:00:06 -0000	1.20
+++ wikisrc/ports/news68k.mdwn	9 Sep 2020 15:37:52 -0000	1.21
@@ -33,13 +33,13 @@
 ## Supported peripherals
 
 -   On-board LANCE ethernet interface
-    ([le(4)](http://netbsd.gw.com/cgi-bin/man-cgi?le+4))
+    ([[!template id=man name="le" section="4"]]
 -   On-board SONY CXD1180 SCSI interface
-    ([si(4)](http://netbsd.gw.com/cgi-bin/man-cgi?si+4))
+    ([[!template id=man name="si" section="4"]]
 -   Most SCSI devices
 -   keyboard (*kb*), mouse (*ms*)
 -   On-board Z8530 serial interfaces
-    ([zsc(4)](http://netbsd.gw.com/cgi-bin/man-cgi?zsc+4))
+    ([[!template id=man name="zsc" section="4"]]
 -   framebuffers (*romcons*)
 
 """
Index: wikisrc/ports/rs6000.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/rs6000.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/ports/rs6000.mdwn	15 Feb 2020 08:00:06 -0000	1.16
+++ wikisrc/ports/rs6000.mdwn	9 Sep 2020 15:37:52 -0000	1.17
@@ -25,7 +25,7 @@
 
 ##TODO
 
-* implement [bus_dma(9)](http://netbsd.gw.com/cgi-bin/man-cgi?bus_dma+9) for
+* implement [[!template id=man name="bus_dma" section="9"]] for
 machine independent [MCA device drivers](http://www.NetBSD.org/support/hardware/mca.html)
 * test on more models
 
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/ports/sparc64.mdwn	15 Feb 2020 08:00:07 -0000	1.28
+++ wikisrc/ports/sparc64.mdwn	9 Sep 2020 15:37:52 -0000	1.29
@@ -17,8 +17,8 @@
 support for running most 32-bit binaries as well, with the exception of some
 low level kernel groveling tools. Additionally, NetBSD/sparc64 is able to run
 Solaris 64 and 32 bit binaries with emulation. See
-[compat_netbsd32(8)](http://netbsd.gw.com/cgi-bin/man-cgi?compat_netbsd32+8+NetBSD-5.1+i386),
-[compat_solaris(8)](http://netbsd.gw.com/cgi-bin/man-cgi?compat_solaris+8+NetBSD-5.1+i386) and the pkgsrc package [`emulators/netbsd32_compat16`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/emulators/netbsd32_compat16/README.html).
+[[!template id=man name="compat_netbsd32" section="8" collection="NetBSD-5.1"]],
+[[!template id=man name="compat_solaris" section="8" collection="NetBSD-5.1"]] and the pkgsrc package [`emulators/netbsd32_compat16`](http://ftp.NetBSD.org/pub/pkgsrc/current/pkgsrc/emulators/netbsd32_compat16/README.html).
 
 Martin Husemann is the maintainer for NetBSD/sparc64.
 """
Index: wikisrc/ports/luna68k/luna68k_install.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/luna68k/luna68k_install.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/ports/luna68k/luna68k_install.mdwn	15 Jan 2014 13:03:06 -0000	1.1
+++ wikisrc/ports/luna68k/luna68k_install.mdwn	9 Sep 2020 15:37:53 -0000	1.2
@@ -164,12 +164,12 @@
 Vender supplied OS has such a rather obscure convention
 to keep its root filesystem on partition c that's not comfortable
 with NetBSD standard.
-Use [disklabel(8)](http://netbsd.gw.com/cgi-bin/man-cgi?disklabel+8.luna68k)
+Use [[!template id=man name="disklabel" section="8"]]
 command to make the new filesystem layout.
 
 LUNA ROM monitor can search and load kernel images on the root filesystem.
 To make this possible, the root filesystem must be created in the 'old FFS'
-format. Make sure to have -O (large letter oh) for [newfs(8)](http://netbsd.gw.com/cgi-bin/man-cgi?newfs+8.luna68k).
+format. Make sure to have -O (large letter oh) for [[!template id=man name="newfs" section="8"]].
 Other filesystems do not require the option.
 
 Then mount the root filesystem somewhere, say /mnt,

Use man template. Do not force scheme on links to www or mail-index.
Index: wikisrc/ports/hp300faq.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hp300faq.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/hp300faq.mdwn	13 Jan 2014 09:43:28 -0000	1.6
+++ wikisrc/ports/hp300faq.mdwn	9 Sep 2020 15:26:11 -0000	1.7
@@ -22,16 +22,16 @@
 to download the boot code from the server. The server must run a daemon
 capable of responding to HP RMP boot requests. If your server runs
 NetBSD, it has
-*[rbootd(8)](http://netbsd.gw.com/cgi-bin/man-cgi?rbootd+8)*
+*[[!template id=man name="rbootd" section="8"]]*
 in the base system. If your server runs another OS, like Linux or
 Solaris, you can try [YAMAMORI Takenori's *sun-rbootd*
 package](http://www15.big.or.jp/~yamamori/sun/netbsd-hp_e.html).
 
 To set up your NetBSD/hp300 workstation, follow the
-*[diskless(8)](http://netbsd.gw.com/cgi-bin/man-cgi?diskless+8)*
+*[[!template id=man name="diskless" section="8"]]*
 man page. For more detailed instructions, see the [Diskless
-HOW-TO](http://www.NetBSD.org/docs/network/netboot/) and its
-[Setting up the rbootd server section](http://www.NetBSD.org/docs/network/netboot/rbootd/).
+HOW-TO](//www.NetBSD.org/docs/network/netboot/) and its
+[Setting up the rbootd server section](//www.NetBSD.org/docs/network/netboot/rbootd/).
 
 ## How can I change Ethernet media types on 4xx models?
 
@@ -123,7 +123,7 @@
 motherboard into a normal DIO-II chassis and use it as a "normal" Series
 300 system. The only problem he encountered was the physical size of the
 Ethernet option. See [Jarkko Teppo's
-report](http://mail-index.NetBSD.org/port-hp300/1999/07/16/0000.html)
+report](//mail-index.NetBSD.org/port-hp300/1999/07/16/0000.html)
 for more info.
 
 ## What does 'UNEXPECTED USE OF FFFFFFC4' mean?
@@ -330,10 +330,9 @@
 
 ## What are the different types of serial ports, and how do I access them?
 
-NetBSD -current has switched to using the
-[com(4)](http://netbsd.gw.com/cgi-bin/man-cgi?com+4)
-driver for [dca](http://man.NetBSD.org/man/dca+4.hp300+NetBSD-1.6) and
-[apci](http://man.NetBSD.org/man/apci+4.hp300+NetBSD-1.6) devices. This
+NetBSD -current has switched to using the [[!template id=man name="com" section="4"]]
+driver for [[!template id=man name="dca" section="4" arch="hp300" collection="NetBSD-1.6.2"]]
+and [[!template id=man name="apci" section="4" arch="hp300" collection="NetBSD-1.6.2"]] devices. This
 covers all built-in serial ports and some DIO serial interfaces. With
 this change, the device files have changed. All DCA and APCI serial
 ports are `/dev/ttyC[0123]` and all DCM serial ports are
@@ -346,19 +345,25 @@
 use of a break-out cable.
 
 Additionally, see the [NetBSD Serial Port
-Primer](http://www.NetBSD.org/docs/Hardware/Misc/serial.html) for
+Primer](//www.NetBSD.org/docs/Hardware/Misc/serial.html) for
 information on the wiring and pinouts of various serial cables.
+See also the [[!template id=man name="com" section="4"]],
+and [[!template id=man name="dcm" section="4" arch="hp300"]]
+manual pages, as well as the
+[[!template id=man name="dcl" section="4" arch="hp300" collection="NetBSD-1.5.3"]]
+manual page from NetBSD 1.5.3.
+
 
 [[!table data="""
 *device name*	|*location*	|*pre-2.0 device file*	|*max speed*	|*hardware handshaking*	|*FIFO*		|*serial console*	|*comments*
-[com](http://man.NetBSD.org/man/com+4.hp300)0 *(formerly `dca0`)*	|built-in	|/dev/tty0	|19200		|no	|no	|DIP switches	|318, 319, 320, 330, 340, 350, 360, 370<br /><br />located on Human/System Interface board, requires [[dca.cable|special bable]])
-[com](http://man.NetBSD.org/man/com+4.hp300)0 *(formerly `dca0`)*	|built-in	|/dev/tty0	|38400	|yes	|yes	|config Boot ROM	|345, 362, 375, 380, 382, 385, 400 Series *(except 425e)*<br /><br />located on motherboard
-[com](http://man.NetBSD.org/man/com+4.hp300)1 [com](http://man.NetBSD.org/man/com+4.hp300)2 *(formerly `apciN`)*	|built-in	|/dev/ttya0 /dev/ttya1	|19200	|yes	|no	|no, (425e: yes)	|382, 400 Series<br />requires [[break-out cable|serial.splitter]]
-[com](http://man.NetBSD.org/man/com+4.hp300)N *(formerly `dcaN`)*	|98644A DIO-I card	|/dev/ttyN	|19200	|yes	|no	|DIP switches	|hardware handshaking only for transmit
-[com](http://man.NetBSD.org/man/com+4.hp300)N<br />*(formerly `dcaN`{)*	|98626A DIO-I card	|/dev/ttyN	|19200	|yes	|no	|DIP switches	|hardware handshaking only for transmit
-[dcm](http://man.NetBSD.org/man/dcm+4.hp300)N	|98642A DIO-I card	|/dev/tty0[0-3]		|19200		|yes	|yes, 128/16 bytes	|DIP switches	|Only port 0 has flow control, only port 1 does console Uses<br />[RJ-11](dcmpinouts.html) jacks
-[dcm](http://man.NetBSD.org/man/dcm+4.hp300+NetBSD-current)N [dcm](http://man.NetBSD.org/man/dcm+4.hp300+NetBSD-current)N+1	|98638 DIO-II card	|/dev/tty0[0-3], /dev/tty0[4-7]	|19200	|yes	|yes, 127/16 bytes	|no	|Appears to kernel as two 98642 boards
-[dcl](http://man.NetBSD.org/man/dcl+4.hp300+NetBSD-current)N, *(not supported)*	|98628A DIO-I card	|/dev/ttyN	|19200	|yes	|yes, 25 bytes	|jumper	|weird centronics connector goes to normal db25
+`com0`<br />*(formerly `dca0`)*	|built-in	|/dev/tty0	|19200		|no	|no	|DIP switches	|318, 319, 320, 330, 340, 350, 360, 370<br /><br />located on Human/System Interface board, requires [[dca.cable|special cable]])
+`com0`<br />*(formerly `dca0`)*	|built-in	|/dev/tty0	|38400	|yes	|yes	|config Boot ROM	|345, 362, 375, 380, 382, 385, 400 Series *(except 425e)*<br /><br />located on motherboard
+`com1` `com2`<br />*(formerly `apciN`)*	|built-in	|/dev/ttya0 /dev/ttya1	|19200	|yes	|no	|no, (425e: yes)	|382, 400 Series<br />requires [[break-out cable|serial.splitter]]
+`comN`<br />*(formerly `dcaN`)*	|98644A DIO-I card	|/dev/ttyN	|19200	|yes	|no	|DIP switches	|hardware handshaking only for transmit
+`comN`<br />*(formerly `dcaN`)*	|98626A DIO-I card	|/dev/ttyN	|19200	|yes	|no	|DIP switches	|hardware handshaking only for transmit
+`dcmN`	|98642A DIO-I card	|/dev/tty0[0-3]		|19200		|yes	|yes, 128/16 bytes	|DIP switches	|Only port 0 has flow control, only port 1 does console Uses<br />[RJ-11](dcmpinouts.html) jacks
+`dcmN` `dcmN+1`	|98638 DIO-II card	|/dev/tty0[0-3], /dev/tty0[4-7]	|19200	|yes	|yes, 127/16 bytes	|no	|Appears to kernel as two 98642 boards
+`dclN`<br />*(not supported)*	|98628A DIO-I card	|/dev/ttyN	|19200	|yes	|yes, 25 bytes	|jumper	|weird centronics connector goes to normal db25
 """]]
 
 ## Setting up a serial console on a 98561, 98562, 98626, 98628, 98642, or 98644
@@ -480,16 +485,16 @@
     made available by Michael Wolfson
 
 -   [hp300 series HW brain dump by Mike
-    Hibler](http://mail-index.NetBSD.org/port-hp300/1994/12/15/0007.html)
+    Hibler](//mail-index.NetBSD.org/port-hp300/1994/12/15/0007.html)
 
 -   [HP Computer Museum](http://www.hpmuseum.net/index.php)
 
--   [Diskless NetBSD HOW-TO](http://www.NetBSD.org/docs/network/netboot/)
+-   [Diskless NetBSD HOW-TO](//www.NetBSD.org/docs/network/netboot/)
 
--   [NetBSD Serial Port Primer](http://www.NetBSD.org/docs/Hardware/Misc/serial.html)
+-   [NetBSD Serial Port Primer](//www.NetBSD.org/docs/Hardware/Misc/serial.html)
 
--   [port-hp300 mail list](http://www.NetBSD.org/mailinglists/#port-hp300) - if you have
+-   [port-hp300 mail list](//www.NetBSD.org/mailinglists/#port-hp300) - if you have
     any additional questions please subscribe.
 
--   [General NetBSD Documentation](http://www.NetBSD.org/docs/) - questions not specific
+-   [General NetBSD Documentation](//www.NetBSD.org/docs/) - questions not specific
     to NetBSD/hp300.

Do not force the scheme on links to man.NetBSD.org
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- wikisrc/templates/page.tmpl	9 Aug 2020 12:47:47 -0000	1.66
+++ wikisrc/templates/page.tmpl	9 Sep 2020 14:34:02 -0000	1.67
@@ -93,7 +93,7 @@
 		    FAQ &amp; HOWTOs</a></li>
 	<li><a href="//www.NetBSD.org/docs/guide/en/">
 		    The Guide</a></li>
-	<li><a href="http://man.NetBSD.org/">
+	<li><a href="//man.NetBSD.org/">
 		    Manual pages</a></li>
 	<li><a href="//wiki.NetBSD.org/">
 		    Wiki</a></li>

Do not force the scheme on links to man.NetBSD.org
Index: wikisrc/wiki/todo/ikiwiki_as_man.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/todo/ikiwiki_as_man.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/wiki/todo/ikiwiki_as_man.mdwn	27 May 2013 12:55:32 -0000	1.1
+++ wikisrc/wiki/todo/ikiwiki_as_man.mdwn	9 Sep 2020 14:32:17 -0000	1.2
@@ -1,5 +1,5 @@
 If we like ikiwiki-as-wiki, we might [[eventually|wiki/todo/later]]
-want to use it for browsing [NetBSD manual pages](http://man.netbsd.org/)
+want to use it for browsing [NetBSD manual pages](//man.NetBSD.org/)
 as well.
 
 [[schmonz]] wrote [[!iki plugins/contrib/mandoc]].

Use man template
Index: wikisrc/tutorials/atf.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/atf.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/tutorials/atf.mdwn	8 Sep 2020 21:05:59 -0000	1.17
+++ wikisrc/tutorials/atf.mdwn	9 Sep 2020 14:28:56 -0000	1.18
@@ -11,17 +11,17 @@
 and includes a short reference of the most commonly used functions.
 
 You should start by reading the
-[tests(7)](//man.NetBSD.org/tests.7) manual
+[[!template id=man name="tests" section="7"]] manual
 page, which provides a user-level overview on how to run the tests included in
 NetBSD.  While reading this tutorial, you may also want to refer to these pages
 on a need-to-know basis:
-[atf-run(1)](//man.NetBSD.org/atf-run.1),
-[atf-report(1)](//man.NetBSD.org/atf-report.1),
-[atf-test-program(1)](//man.NetBSD.org/atf-test-program.1),
-[atf-c-api(3)](//man.NetBSD.org/atf-c-api.3),
-[atf-sh-api(3)](//man.NetBSD.org/atf-sh-api.3)
+[[!template id=man name="atf-run" section="1"]],
+[[!template id=man name="atf-report" section="1"]],
+[[!template id=man name="atf-test-program" section="1"]],
+[[!template id=man name="atf-c-api" section="3"]],
+[[!template id=man name="atf-sh-api" section="3"]]
 and
-[atf-check(1)](//man.NetBSD.org/atf-check.1).
+[[!template id=man name="atf-check" section="1"]].
 
 **IMPORTANT: Do not take anything for granted, ESPECIALLY if you have previously
 worked with and/or have seen src/regress/.  Your assumptions are most likely
@@ -458,7 +458,7 @@
   It may need some experience to get it right, but it allows, in one line, to
   check the execution of a command.  Where check means: validate exit code,
   stdout and stderr.  This is just a wrapper over atf-check, so please refer to
-  [atf-check(1)](//man.NetBSD.org/atf-check.1)
+  [[!template id=man name="atf-check" section="1"]]
   for more details.
 
 * atf_check_equal value1 value2: Check that the two values are equal and, if
Index: wikisrc/tutorials/bus_space_tutorial.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/bus_space_tutorial.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/tutorials/bus_space_tutorial.mdwn	8 Sep 2020 21:05:59 -0000	1.15
+++ wikisrc/tutorials/bus_space_tutorial.mdwn	9 Sep 2020 14:28:56 -0000	1.16
@@ -376,7 +376,7 @@
     -   aux
         - same as with match function
 -   See definitions of these functions in the
-    [driver(9)](//man.NetBSD.org/driver.9)
+    [[!template id=man name="driver" section="9"]]
     man page.
 
 ### Adding the new PCI driver - main driver cont'd
@@ -401,7 +401,7 @@
 <!-- -->
 
     #include <sys/cdefs.h>
-    __KERNEL_RCSID(0, "$NetBSD: bus_space_tutorial.mdwn,v 1.15 2020/09/08 21:05:59 kim Exp $");
+    __KERNEL_RCSID(0, "$NetBSD: bus_space_tutorial.mdwn,v 1.16 2020/09/09 14:28:56 kim Exp $");
     #include <sys/param.h>
     #include <sys/device.h>
     #include <dev/pci/pcivar.h>
@@ -514,7 +514,7 @@
 -   The exact position of the rule in the configuration file is not
     important in this case
 -   See
-    [config(5)](//man.NetBSD.org/config.5)
+    [[!template id=man name="config" section="5"]]
     for a description of the device definition language
 
 ### Adding the new PCI driver - example
@@ -750,7 +750,7 @@
 
 -   There are many more variants of read and write functions and they
     are useful in certain situations, see the
-    [bus\_space(9)](//man.NetBSD.org/bus_space.9)
+    [[!template id=man name="bus_space" section="9"]]
     man page
 
 ### Accessing the hardware registers - example
@@ -929,15 +929,15 @@
 
 ### Operations on device files
 
--   [open(2)](//man.NetBSD.org/open.2)
+-   [[!template id=man name="open" section="2"]]
     and
-    [close(2)](//man.NetBSD.org/close.2)
--   [read(2)](//man.NetBSD.org/read.2)
+    [[!template id=man name="close" section="2"]]
+-   [[!template id=man name="read" section="2"]]
     and
-    [write(2)](//man.NetBSD.org/write.2)
--   [ioctl(2)](//man.NetBSD.org/ioctl.2)
--   [poll(2)](//man.NetBSD.org/poll.2)
--   [mmap(2)](//man.NetBSD.org/mmap.2)
+    [[!template id=man name="write" section="2"]]
+-   [[!template id=man name="ioctl" section="2"]]
+-   [[!template id=man name="poll" section="2"]]
+-   [[!template id=man name="mmap" section="2"]]
 -   and more...
 -   Any mix of the above system calls might be used to interface between
     the kernel and user space
@@ -1240,11 +1240,11 @@
         Kunz](ftp://ftp.netbsd.org/pub/NetBSD/misc/ddwg/NetBSD-driver_writing-1.0.1e.pdf)
     -   [NetBSD Documentation: Writing a pseudo
         device](http://www.netbsd.org/docs/kernel/pseudo/)
-    -   [autoconf(9)](//man.NetBSD.org/autoconf.9),
-        [bus\_space(9)](//man.NetBSD.org/bus_space.9)
-        [bus\_dma(9)](//man.NetBSD.org/bus_dma.9)
-        [driver(9)](//man.NetBSD.org/driver.9),
-        [pci(9)](//man.NetBSD.org/pci.9)
+    -   [[!template id=man name="autoconf" section="9"]],
+        [[!template id=man name="bus_space" section="9"]]
+        [[!template id=man name="bus_dma" section="9"]]
+        [[!template id=man name="driver" section="9"]],
+        [[!template id=man name="pci" section="9"]]
         man pages, etc.
 
 -   Example source code of drivers:
Index: wikisrc/tutorials/faking_a_mac_address.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/faking_a_mac_address.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/tutorials/faking_a_mac_address.mdwn	8 Sep 2020 21:05:59 -0000	1.3
+++ wikisrc/tutorials/faking_a_mac_address.mdwn	9 Sep 2020 14:28:56 -0000	1.4
@@ -31,4 +31,4 @@
 
 ##  See also 
 
-  * [ifconfig(8)](//man.NetBSD.org/ifconfig.8)
+  * [[!template id=man name="ifconfig" section="8"]]
Index: wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn	8 Sep 2020 21:05:59 -0000	1.2
+++ wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn	9 Sep 2020 14:28:56 -0000	1.3
@@ -84,8 +84,8 @@
 
 ##  References
 
-  * [boot(8)](//man.NetBSD.org/boot.8)
-  * [fdisk(8)](//man.NetBSD.org/fdisk.8)
-  * [installboot(8)](//man.NetBSD.org/installboot.8)
-  * [mbr(8)](//man.NetBSD.org/mbr.8)
+  * [[!template id=man name="boot" section="8"]]
+  * [[!template id=man name="fdisk" section="8"]]
+  * [[!template id=man name="installboot" section="8"]]
+  * [[!template id=man name="mbr" section="8"]]
 
Index: wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn	8 Sep 2020 21:05:59 -0000	1.4
+++ wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn	9 Sep 2020 14:28:56 -0000	1.5
@@ -1,8 +1,8 @@
-The [powerd(8)](//man.NetBSD.org/powerd.8) daemon acts upon power management events posted by the kernel's power management facility, translating the events into a script name and arguments. These scripts are found in `/etc/powerd/scripts/`. 
+The [[!template id=man name="powerd" section="8"]] daemon acts upon power management events posted by the kernel's power management facility, translating the events into a script name and arguments. These scripts are found in `/etc/powerd/scripts/`. 
 
 The `lid_switch` script is called on lid-open and -close events. An event of `pressed` means the lid has been closed, and `released` that the lid has been opened. 
 
-The following `lid_switch` uses [xset(1)](//man.NetBSD.org/xset.1) to forcibly blank the screen on lid-close, and refresh the screen on lid-open: 
+The following `lid_switch` uses [[!template id=man name="xset" section="1"]] to forcibly blank the screen on lid-close, and refresh the screen on lid-open: 
     
 [[!template id=programlisting text="""
     #!/bin/sh
Index: wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn	8 Sep 2020 21:05:59 -0000	1.5
+++ wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn	9 Sep 2020 14:28:56 -0000	1.6
@@ -18,7 +18,7 @@
 
 #dmesg
 
-Use [dmesg](//man.NetBSD.org/dmesg) to obtain information about network adapters on the NetBSD machine:
+Use [[!template id=man name="dmesg" section="8"]] to obtain information about network adapters on the NetBSD machine:
 
     $ dmesg | more  
     $ less /var/run/dmesg.boot  
@@ -75,7 +75,7 @@
 
 #ping

(Diff truncated)
Use man template
Index: wikisrc/projects/project/binary_compat_puffs_backend.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/binary_compat_puffs_backend.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/projects/project/binary_compat_puffs_backend.mdwn	16 Feb 2016 17:58:53 -0000	1.5
+++ wikisrc/projects/project/binary_compat_puffs_backend.mdwn	9 Sep 2020 13:32:12 -0000	1.6
@@ -11,7 +11,7 @@
 duration="3 months"
 
 description="""
-Currently, the [puffs(3)](http://netbsd.gw.com/cgi-bin/man-cgi?puffs+3+NetBSD-5.1+i386) interface between the kernel and userspace uses various system structures for passing information. Examples are `struct stat` and `struct uucred`. If these change in layout (such as with the time_t size change in NetBSD 6.0), old puffs servers must be recompiled.
+Currently, the [[!template id=man name="puffs" section="3" collection="NetBSD-5.1"]] interface between the kernel and userspace uses various system structures for passing information. Examples are `struct stat` and `struct uucred`. If these change in layout (such as with the time_t size change in NetBSD 6.0), old puffs servers must be recompiled.
 
 The project milestones are:
 
@@ -22,6 +22,6 @@
 
 While this project will be partially implemented in the kernel, it is fairly well-contained and prior kernel experience is not necessary.
 
-If there is time and interest, a suggested subproject is making sure that [p2k(3)](http://netbsd.gw.com/cgi-bin/man-cgi?p2k+3+NetBSD-5.1+i386) does not suffer from similar issues. This is a required subproject if dual support as mentioned above is not necessary.
+If there is time and interest, a suggested subproject is making sure that [[!template id=man name="p2k" section="3" collection="NetBSD-5.1"]] does not suffer from similar issues. This is a required subproject if dual support as mentioned above is not necessary.
 """
 ]]
Index: wikisrc/projects/project/fast-time.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/fast-time.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/fast-time.mdwn	20 Feb 2015 16:42:42 -0000	1.3
+++ wikisrc/projects/project/fast-time.mdwn	9 Sep 2020 13:32:12 -0000	1.4
@@ -15,7 +15,7 @@
 duration="3 months"
 
 description="""
-Design and implement a mechanism that allows for fast user level access to kernel time data structures for NetBSD. For certain types of small data structures the system call overhead is significant. This is especially true for frequently invoked system calls like [clock_gettime(2)](http://netbsd.gw.com/cgi-bin/man-cgi?clock_gettime+2+NetBSD-5.1+i386) and [gettimeofday(2)](http://netbsd.gw.com/cgi-bin/man-cgi?gettimeofday+2+NetBSD-5.1+i386). With the availability of user level readable high frequency counters it is possible to create fast implementations for precision time reading. Optimizing clock_gettime(2) and alike will reduce the strain from applications frequently calling these system calls and improves timing information quality for applications like NTP. The implementation would be based on a to-be-modified version of the timecounters implementation in NetBSD.
+Design and implement a mechanism that allows for fast user level access to kernel time data structures for NetBSD. For certain types of small data structures the system call overhead is significant. This is especially true for frequently invoked system calls like [[!template id=man name="clock_gettime" section="2" collection="NetBSD-5.1"]] and [[!template id=man name="gettimeofday" section="2" collection="NetBSD-5.1"]]. With the availability of user level readable high frequency counters it is possible to create fast implementations for precision time reading. Optimizing clock_gettime(2) and alike will reduce the strain from applications frequently calling these system calls and improves timing information quality for applications like NTP. The implementation would be based on a to-be-modified version of the timecounters implementation in NetBSD.
 
 Milestones:
 
Index: wikisrc/projects/project/kernel_udp_timestamping.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/kernel_udp_timestamping.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/kernel_udp_timestamping.mdwn	14 Feb 2013 22:33:56 -0000	1.4
+++ wikisrc/projects/project/kernel_udp_timestamping.mdwn	9 Sep 2020 13:32:12 -0000	1.5
@@ -16,12 +16,12 @@
 done_by="Vlad Balan"
 
 description="""
-Many applications that use UDP unicast or multicast to receive data, need to store the data together with its reception time, or time the arrival time of packets as precisely as possible. This is required for example in order to be able to replay the data in simulated real-time to be able to do further performance analysis or quality control. Right now the only way to do this is to call [recv(2)](http://netbsd.gw.com/cgi-bin/man-cgi?recv+2+NetBSD-5.1+i386)/[recvmsg(2)](http://netbsd.gw.com/cgi-bin/man-cgi?recvmsg+2+NetBSD-5.1+i386)/[recvfrom(2)](http://netbsd.gw.com/cgi-bin/man-cgi?recvfrom+2+NetBSD-5.1+i386) to grab the data, followed by [gettimeofday(2)](http://netbsd.gw.com/cgi-bin/man-cgi?gettimeofday+2+NetBSD-5.1+i386)/[clock_gettime(2)](http://netbsd.gw.com/cgi-bin/man-cgi?clock_gettime+2+NetBSD-5.1+i386). This is undesirable because:
+Many applications that use UDP unicast or multicast to receive data, need to store the data together with its reception time, or time the arrival time of packets as precisely as possible. This is required for example in order to be able to replay the data in simulated real-time to be able to do further performance analysis or quality control. Right now the only way to do this is to call [[!template id=man name="recv" section="2" collection="NetBSD-5.1"]]/[[!template id=man name="recvmsg" section="2" collection="NetBSD-5.1"]]/[[!template id=man name="recvfrom" section="2" collection="NetBSD-5.1"]] to grab the data, followed by [[!template id=man name="gettimeofday" section="2" collection="NetBSD-5.1"]]/[[!template id=man name="clock_gettime" section="2" collection="NetBSD-5.1"]]. This is undesirable because:
 
 * It doubles the number of system calls limiting the effective maximum reception rate.
 * The timing of the packet is imprecise because there non-deterministic delay from the time that the packet hit the network adapter till the time userland received it.
 
-Linux provides a socket control message to add timestamp ancillary data to the the socket, which can be controlled by 2 different socket options SO_TIMESTAMP and SO_TIMESTAMPNS, using [setsockopt(2)](http://netbsd.gw.com/cgi-bin/man-cgi?setsockopt+2+NetBSD-5.1+i386). Recently linux added more [SO_TIMESTAMPING_*](http://lwn.net/Articles/325929/) options to provide even more precise timestamps from NIC cards that support them. This project is about implementing those options on NetBSD. Their implementation should be done as close to the code that does reception as possible to minimize timestamp delay. The SO_TIMESTAMP option is already done in the kernel (perhaps only partially): [kern](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/uipc_socket.c), [ip](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/ip_input.c), [raw](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/raw_ip.c), [udp](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/udp_usrreq.c), [ip6](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys
+Linux provides a socket control message to add timestamp ancillary data to the the socket, which can be controlled by 2 different socket options SO_TIMESTAMP and SO_TIMESTAMPNS, using [[!template id=man name="setsockopt" section="2" collection="NetBSD-5.1"]]. Recently linux added more [SO_TIMESTAMPING_*](http://lwn.net/Articles/325929/) options to provide even more precise timestamps from NIC cards that support them. This project is about implementing those options on NetBSD. Their implementation should be done as close to the code that does reception as possible to minimize timestamp delay. The SO_TIMESTAMP option is already done in the kernel (perhaps only partially): [kern](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/uipc_socket.c), [ip](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/ip_input.c), [raw](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/raw_ip.c), [udp](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet/udp_usrreq.c), [ip6](http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/netinet
 
 This project is to finish implementing SO_TIMESTAMP in the kernel, test it, add SO_TIMESTAMPNS (both very easy, should be a few hours of work), and then design and implement the SO_TIMESTAMPING_* options, get at least one driver working with them and test them.
 
Index: wikisrc/projects/project/mpsafe_net_driver.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/mpsafe_net_driver.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/mpsafe_net_driver.mdwn	18 Jan 2019 14:36:47 -0000	1.1
+++ wikisrc/projects/project/mpsafe_net_driver.mdwn	9 Sep 2020 13:32:12 -0000	1.2
@@ -19,8 +19,8 @@
 Adapting old drivers to be able to run with the rest of the network stack not having this lock will improve NetBSD networking.  
 A large number of drivers must be adapted, and some of them can be emulated from virtual machines too, some examples:  
 
-* [RealTek ethernet](http://netbsd.gw.com/cgi-bin/man-cgi?re++NetBSD-current) (QEMU)
-* [Atheros ethernet](http://netbsd.gw.com/cgi-bin/man-cgi?alc++NetBSD-current)
+* RealTek ethernet [[!template id=man name="re" section="4"]] (QEMU)
+* Atheros ethernet [[!template id=man name="alc" section="4"]]
 
 <!-- XXX list more -->
 """
Index: wikisrc/projects/project/scalable-entropy.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/scalable-entropy.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/scalable-entropy.mdwn	23 Feb 2016 16:45:42 -0000	1.1
+++ wikisrc/projects/project/scalable-entropy.mdwn	9 Sep 2020 13:32:12 -0000	1.2
@@ -16,7 +16,7 @@
 
 description="""
 The kernel entropy pool provides unpredictable secrets via the
- [/dev/urandom](http://netbsd.gw.com/cgi-bin/man-cgi?rnd++NetBSD-current)
+ [[!template id=man name="rnd" section="4"]] (/dev/urandom)
  device for applications doing cryptography, Monte Carlo simulations,
  etc.
 To provide unpredictable secrets, the kernel observes various physical
Index: wikisrc/projects/project/sysinst-enhancements.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/sysinst-enhancements.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/projects/project/sysinst-enhancements.mdwn	14 Feb 2013 22:37:55 -0000	1.6
+++ wikisrc/projects/project/sysinst-enhancements.mdwn	9 Sep 2020 13:32:13 -0000	1.7
@@ -61,9 +61,9 @@
 ### References:
 
 * [sysinst source (opengrok)](http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/utils/sysinst/)
-* [vnconfig manual page](http://netbsd.gw.com/cgi-bin/man-cgi?vnconfig++NetBSD-current)
-* [raidctl manual page](http://netbsd.gw.com/cgi-bin/man-cgi?raidctl++NetBSD-current)
-* [cgdconfig manual page](http://netbsd.gw.com/cgi-bin/man-cgi?cgdconfig++NetBSD-current)
+* [[!template id=man name="vnconfig" section="8"]] manual page
+* [[!template id=man name="raidctl" section="8"]] manual page
+* [[!template id=man name="cgdconfig" section="8"]] manual page
 * [LVM on NetBSD](http://www.netbsd.org/docs/guide/en/chap-lvm.html)
 * [Anita automated testing](http://www.gson.org/netbsd/anita/)
 """
Index: wikisrc/projects/project/sysinst-xinterface.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/sysinst-xinterface.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/sysinst-xinterface.mdwn	20 Feb 2015 19:21:44 -0000	1.3
+++ wikisrc/projects/project/sysinst-xinterface.mdwn	9 Sep 2020 13:32:12 -0000	1.4
@@ -48,7 +48,7 @@
 #### References:
 
 * [sysinst source](http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/utils/sysinst/) ([opengrok](http://nxr.netbsd.org/xref/src/distrib/utils/sysinst/))
-* [vnconfig manual page](http://netbsd.gw.com/cgi-bin/man-cgi?vnconfig++NetBSD-current)
+* [[!template id=man name="vnconfig" section="8"]] manual page
 """
 ]]
 
Index: wikisrc/projects/project/tickless.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/tickless.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/tickless.mdwn	19 Mar 2020 07:39:51 -0000	1.4
+++ wikisrc/projects/project/tickless.mdwn	9 Sep 2020 13:32:12 -0000	1.5
@@ -47,7 +47,7 @@
 
 4. Convert the various software subsystems that rely on periodic timer
  interrupts every tick, or every second, via
- [callouts](http://netbsd.gw.com/cgi-bin/man-cgi?callout++NetBSD-current),
+ [[!template id=man name="callout" section="9"]],
  either to avoid periodic work altogether, or to batch it up only when
  the machine is about to go idle, in order to reduce the number of
  wakeups and thereby reduce power consumption.
Index: wikisrc/projects/project/userland_pci.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/userland_pci.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/userland_pci.mdwn	23 Feb 2016 17:29:23 -0000	1.1
+++ wikisrc/projects/project/userland_pci.mdwn	9 Sep 2020 13:32:12 -0000	1.2
@@ -24,25 +24,24 @@
 However, userland code has only limited access to the hardware
  registers needed to control devices: currently, NetBSD supports only
  USB device drivers in userland, via
- [ugen(4)](http://netbsd.gw.com/cgi-bin/man-cgi?ugen++NetBSD-current).
+ [[!template id=man name="ugen" section="4"]].
 NetBSD should additionally support developing PCI drivers in userland
  with rump -- at least one driver,
- [iwm(4)](http://netbsd.gw.com/cgi-bin/man-cgi?iwm++NetBSD-current), was
+ [[!template id=man name="iwm" section="4"]], was
  developed using rump, but on a Linux host!
 
 There are several milestones to this project:
 
 1. Implement enough of the
- [bus_space(9)](http://netbsd.gw.com/cgi-bin/man-cgi?bus_space++NetBSD-current)
+ [[!template id=man name="bus_space" section="9"]]
  and
- [pci_mapreg(9)](http://netbsd.gw.com/cgi-bin/man-cgi?pci+9+NetBSD-current)
+ `pci_mapreg()` ([[!template id=man name="pci" section="9"]])
  APIs to map device registers from PCI BARs, using a
- [/dev/pciN](http://netbsd.gw.com/cgi-bin/man-cgi?pci+4+NetBSD-current)
- device.
+ [[!template id=man name="pci" section="4"]] device (/dev/pciN).
 A first approximation can be done using
- [pci(3)](http://netbsd.gw.com/cgi-bin/man-cgi?bus_space++NetBSD-current)
+ [[!template id=man name="pci" section="3"]]
  and simply mmapping from
- [/dev/mem](http://netbsd.gw.com/cgi-bin/man-cgi?mem+4+NetBSD-current),
+ [[!template id=man name="mem" section="4"]] (/dev/mem),
  but it would be better to cooperate with the kernel so that the
  kernel can limit the user to mapping ranges listed in PCI BARs without
  granting privileges to read all physical pages in the system.
@@ -51,9 +50,9 @@
  level of the userland process, on x86 systems.
 

(Diff truncated)
Forgot how collection is specified
Index: wikisrc/projects/project/putter_pud_puffs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/putter_pud_puffs.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/putter_pud_puffs.mdwn	9 Sep 2020 12:25:42 -0000	1.4
+++ wikisrc/projects/project/putter_pud_puffs.mdwn	9 Sep 2020 12:27:36 -0000	1.5
@@ -16,7 +16,7 @@
 done_by="Vyacheslav Matyushin"
 
 description="""
-As is well-known, [[!template id=man name="puffs" section="3" collection="5.1"]] is the NetBSD userspace file system framework. It provides support for implementing file servers in userspace. A lesser known "cousin" of puffs is the Pass-to-Userspace Device, or [[!template id=man name="pud" section="4" collection="5.1"]] framework, which provides support for implementing character and block device servers in userspace. Both use [[!template id=man name="putter" section="9" collection="5.1"]] for transmitting requests to and from the kernel.
+As is well-known, [[!template id=man name="puffs" section="3" collection="NetBSD-5.1"]] is the NetBSD userspace file system framework. It provides support for implementing file servers in userspace. A lesser known "cousin" of puffs is the Pass-to-Userspace Device, or [[!template id=man name="pud" section="4" collection="NetBSD-5.1"]] framework, which provides support for implementing character and block device servers in userspace. Both use [[!template id=man name="putter" section="9" collection="NetBSD-5.1"]] for transmitting requests to and from the kernel.
 
 Currently, puffs includes a userspace support library: libpuffs. It provides two facets:
 

Use man template
Index: wikisrc/projects/project/putter_pud_puffs.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/putter_pud_puffs.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/putter_pud_puffs.mdwn	27 Feb 2012 07:42:29 -0000	1.3
+++ wikisrc/projects/project/putter_pud_puffs.mdwn	9 Sep 2020 12:25:42 -0000	1.4
@@ -16,7 +16,7 @@
 done_by="Vyacheslav Matyushin"
 
 description="""
-As is well-known, [puffs(3)](http://netbsd.gw.com/cgi-bin/man-cgi?puffs+3+NetBSD-5.1+i386) is the NetBSD userspace file system framework. It provides support for implementing file servers in userspace. A lesser known "cousin" of puffs is the Pass-to-Userspace Device, or [pud(4)](http://netbsd.gw.com/cgi-bin/man-cgi?pud+4+NetBSD-5.1+i386) framework, which provides support for implementing character and block device servers in userspace. Both use [putter(9)](http://netbsd.gw.com/cgi-bin/man-cgi?putter+9+NetBSD-5.1+i386) for transmitting requests to and from the kernel.
+As is well-known, [[!template id=man name="puffs" section="3" collection="5.1"]] is the NetBSD userspace file system framework. It provides support for implementing file servers in userspace. A lesser known "cousin" of puffs is the Pass-to-Userspace Device, or [[!template id=man name="pud" section="4" collection="5.1"]] framework, which provides support for implementing character and block device servers in userspace. Both use [[!template id=man name="putter" section="9" collection="5.1"]] for transmitting requests to and from the kernel.
 
 Currently, puffs includes a userspace support library: libpuffs. It provides two facets:
 

Use the man template
Index: wikisrc/projects/code-in.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/code-in.mdwn,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- wikisrc/projects/code-in.mdwn	8 Sep 2020 21:36:01 -0000	1.76
+++ wikisrc/projects/code-in.mdwn	9 Sep 2020 12:17:57 -0000	1.77
@@ -264,7 +264,7 @@
   *Tag*: howto  
   *Tag*: system
 
-* **Task: Howto: Protecting your system with veriexec**: There already is [a chapter in the Guide](http://netbsd.org/docs/guide/en/chap-veriexec.html) about veriexec, but there is no comprehensive guide how to activate it and how to check in all files in the distribution (there is [veriexecgen(8)](http://netbsd.gw.com/cgi-bin/man-cgi?veriexecgen++NetBSD-current) for this.  
+* **Task: Howto: Protecting your system with veriexec**: There already is [a chapter in the Guide](http://netbsd.org/docs/guide/en/chap-veriexec.html) about veriexec, but there is no comprehensive guide how to activate it and how to check in all files in the distribution (there is [[!template id=man name="veriexecgen" section="8"]] for this.  
   Your task is to write a howto describing everything a user needs to know and needs to do to have a secure system with veriexec.  
   *Tag*: howto  
   *Tag*: system

Cleanup some stray markup
Index: wikisrc/projects/code-in.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/code-in.mdwn,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- wikisrc/projects/code-in.mdwn	4 May 2019 16:11:34 -0000	1.75
+++ wikisrc/projects/code-in.mdwn	8 Sep 2020 21:36:01 -0000	1.76
@@ -200,7 +200,7 @@
   *Tag*: research
 
 * **Task: Howto: Configure npf**: The new NetBSD packet filter npf is a nice and well-scaling way to configure a firewall. Despite being there and functional, there is not a step-by-step introduction to how configure it.
-  The manpage of [[!template id=man name="npf.conf" section="5"]] gives an introduction, but nothing that could be used as a howto: (http://netbsd.gw.com/cgi-bin/man-cgi?npf.conf+5+NetBSD-current). Also refer to the examples in /usr/share/examples/npf. 
+  The manpage of [[!template id=man name="npf.conf" section="5"]] gives an introduction, but nothing that could be used as a howto. Also refer to the examples in /usr/share/examples/npf. 
   The howto should contain a step-by-step introduction about how npf works, but also an introduction to the technical aspects of npf itself: What kind of rules and tables are there, how they are applied, etc.  
   There is already a [howto by rmind](https://www.netbsd.org/~rmind/npf/), this would have to be checked against errors, updated if needed and extended.  
   *Tag*: howto  

Use man.NetBSD.org
Index: wikisrc/templates/man.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/man.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/templates/man.mdwn	7 Dec 2015 23:12:48 -0000	1.22
+++ wikisrc/templates/man.mdwn	8 Sep 2020 21:31:17 -0000	1.23
@@ -1,5 +1,13 @@
 [[!templatebody <<ENDBODY
-[<TMPL_VAR NAME="name"><TMPL_IF NAME="section">(<TMPL_VAR NAME="section">)</TMPL_IF>](http://netbsd.gw.com/cgi-bin/man-cgi?<TMPL_VAR ESCAPE=URL NAME="name">+<TMPL_IF NAME="section"><TMPL_VAR ESCAPE=URL NAME="section"></TMPL_IF><TMPL_IF NAME="arch">.<TMPL_VAR ESCAPE=URL NAME="arch"></TMPL_IF>+<TMPL_VAR ESCAPE=URL NAME="collection" DEFAULT="NetBSD-current">)
+[<TMPL_VAR NAME="name"><TMPL_IF
+    NAME="section">(<TMPL_VAR
+    NAME="section">)</TMPL_IF>](//man.NetBSD.org/<TMPL_IF
+    NAME="collection"><TMPL_VAR ESCAPE=URL
+    NAME="collection">/</TMPL_IF><TMPL_IF
+    NAME="arch"><TMPL_VAR ESCAPE=URL
+    NAME="arch">/</TMPL_IF><TMPL_VAR ESCAPE=URL
+    NAME="name"><TMPL_IF
+    NAME="section">.<TMPL_VAR ESCAPE=URL NAME="section"></TMPL_IF>)
 ENDBODY]]
 
 ## Description
@@ -9,7 +17,7 @@
 * `name` - This required parameter is the name of the manpage.
 * `section` - This recommended parameter is the manpage section.
 * `arch` - This optional parameter is the machine architecture.
-* `collection` - This optional parameter refers to the NetBSD version and defaults to "NetBSD-current".
+* `collection` - This optional parameter refers to the NetBSD version (e.g. "NetBSD-10.0").
 
 ## Examples
 

Use man.NetBSD.org. Fix some broken links while here.
Index: wikisrc/tutorials/atf.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/atf.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/tutorials/atf.mdwn	16 Feb 2013 12:37:26 -0000	1.16
+++ wikisrc/tutorials/atf.mdwn	8 Sep 2020 21:05:59 -0000	1.17
@@ -11,17 +11,17 @@
 and includes a short reference of the most commonly used functions.
 
 You should start by reading the
-[tests(7)](http://netbsd.gw.com/cgi-bin/man-cgi?tests++NetBSD-current) manual
+[tests(7)](//man.NetBSD.org/tests.7) manual
 page, which provides a user-level overview on how to run the tests included in
 NetBSD.  While reading this tutorial, you may also want to refer to these pages
 on a need-to-know basis:
-[atf-run(1)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-run++NetBSD-current),
-[atf-report(1)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-report++NetBSD-current),
-[atf-test-program(1)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-test-program++NetBSD-current),
-[atf-c-api(3)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-c-api++NetBSD-current),
-[atf-sh-api(3)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-sh-api++NetBSD-current)
+[atf-run(1)](//man.NetBSD.org/atf-run.1),
+[atf-report(1)](//man.NetBSD.org/atf-report.1),
+[atf-test-program(1)](//man.NetBSD.org/atf-test-program.1),
+[atf-c-api(3)](//man.NetBSD.org/atf-c-api.3),
+[atf-sh-api(3)](//man.NetBSD.org/atf-sh-api.3)
 and
-[atf-check(1)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-check++NetBSD-current).
+[atf-check(1)](//man.NetBSD.org/atf-check.1).
 
 **IMPORTANT: Do not take anything for granted, ESPECIALLY if you have previously
 worked with and/or have seen src/regress/.  Your assumptions are most likely
@@ -458,7 +458,7 @@
   It may need some experience to get it right, but it allows, in one line, to
   check the execution of a command.  Where check means: validate exit code,
   stdout and stderr.  This is just a wrapper over atf-check, so please refer to
-  [atf-check(1)](http://netbsd.gw.com/cgi-bin/man-cgi?atf-check++NetBSD-current)
+  [atf-check(1)](//man.NetBSD.org/atf-check.1)
   for more details.
 
 * atf_check_equal value1 value2: Check that the two values are equal and, if
Index: wikisrc/tutorials/bus_space_tutorial.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/bus_space_tutorial.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/tutorials/bus_space_tutorial.mdwn	11 Aug 2016 01:28:01 -0000	1.14
+++ wikisrc/tutorials/bus_space_tutorial.mdwn	8 Sep 2020 21:05:59 -0000	1.15
@@ -376,7 +376,7 @@
     -   aux
         - same as with match function
 -   See definitions of these functions in the
-    [driver(9)](http://netbsd.gw.com/cgi-bin/man-cgi?driver+9+NetBSD-current)
+    [driver(9)](//man.NetBSD.org/driver.9)
     man page.
 
 ### Adding the new PCI driver - main driver cont'd
@@ -401,7 +401,7 @@
 <!-- -->
 
     #include <sys/cdefs.h>
-    __KERNEL_RCSID(0, "$NetBSD: bus_space_tutorial.mdwn,v 1.14 2016/08/11 01:28:01 ryoon Exp $");
+    __KERNEL_RCSID(0, "$NetBSD: bus_space_tutorial.mdwn,v 1.15 2020/09/08 21:05:59 kim Exp $");
     #include <sys/param.h>
     #include <sys/device.h>
     #include <dev/pci/pcivar.h>
@@ -514,7 +514,7 @@
 -   The exact position of the rule in the configuration file is not
     important in this case
 -   See
-    [config(5)](http://netbsd.gw.com/cgi-bin/man-cgi?config+5+NetBSD-current)
+    [config(5)](//man.NetBSD.org/config.5)
     for a description of the device definition language
 
 ### Adding the new PCI driver - example
@@ -750,7 +750,7 @@
 
 -   There are many more variants of read and write functions and they
     are useful in certain situations, see the
-    [bus\_space(9)](http://netbsd.gw.com/cgi-bin/man-cgi?bus_space++NetBSD-current)
+    [bus\_space(9)](//man.NetBSD.org/bus_space.9)
     man page
 
 ### Accessing the hardware registers - example
@@ -929,15 +929,15 @@
 
 ### Operations on device files
 
--   [open(2)](http://netbsd.gw.com/cgi-bin/man-cgi?read++NetBSD-current)
+-   [open(2)](//man.NetBSD.org/open.2)
     and
-    [close(2)](http://netbsd.gw.com/cgi-bin/man-cgi?read++NetBSD-current)
--   [read(2)](http://netbsd.gw.com/cgi-bin/man-cgi?read++NetBSD-current)
+    [close(2)](//man.NetBSD.org/close.2)
+-   [read(2)](//man.NetBSD.org/read.2)
     and
-    [write(2)](http://netbsd.gw.com/cgi-bin/man-cgi?write++NetBSD-current)
--   [ioctl(2)](http://netbsd.gw.com/cgi-bin/man-cgi?write++NetBSD-current)
--   [poll(2)](http://netbsd.gw.com/cgi-bin/man-cgi?poll++NetBSD-current)
--   [mmap(2)](http://netbsd.gw.com/cgi-bin/man-cgi?write++NetBSD-current)
+    [write(2)](//man.NetBSD.org/write.2)
+-   [ioctl(2)](//man.NetBSD.org/ioctl.2)
+-   [poll(2)](//man.NetBSD.org/poll.2)
+-   [mmap(2)](//man.NetBSD.org/mmap.2)
 -   and more...
 -   Any mix of the above system calls might be used to interface between
     the kernel and user space
@@ -1240,11 +1240,11 @@
         Kunz](ftp://ftp.netbsd.org/pub/NetBSD/misc/ddwg/NetBSD-driver_writing-1.0.1e.pdf)
     -   [NetBSD Documentation: Writing a pseudo
         device](http://www.netbsd.org/docs/kernel/pseudo/)
-    -   [autoconf(9)](http://netbsd.gw.com/cgi-bin/man-cgi?autoconf+9+NetBSD-current),
-        [bus\_space(9)](http://netbsd.gw.com/cgi-bin/man-cgi?bus_space+9+NetBSD-current)
-        [bus\_dma(9)](http://netbsd.gw.com/cgi-bin/man-cgi?bus_dma+9+NetBSD-current)
-        [driver(9)](http://netbsd.gw.com/cgi-bin/man-cgi?driver+9+NetBSD-current),
-        [pci(9)](http://netbsd.gw.com/cgi-bin/man-cgi?pci+9+NetBSD-current)
+    -   [autoconf(9)](//man.NetBSD.org/autoconf.9),
+        [bus\_space(9)](//man.NetBSD.org/bus_space.9)
+        [bus\_dma(9)](//man.NetBSD.org/bus_dma.9)
+        [driver(9)](//man.NetBSD.org/driver.9),
+        [pci(9)](//man.NetBSD.org/pci.9)
         man pages, etc.
 
 -   Example source code of drivers:
Index: wikisrc/tutorials/faking_a_mac_address.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/faking_a_mac_address.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/faking_a_mac_address.mdwn	5 Feb 2012 07:14:36 -0000	1.2
+++ wikisrc/tutorials/faking_a_mac_address.mdwn	8 Sep 2020 21:05:59 -0000	1.3
@@ -31,4 +31,4 @@
 
 ##  See also 
 
-  * [ifconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?ifconfig+8+NetBSD-current)
+  * [ifconfig(8)](//man.NetBSD.org/ifconfig.8)
Index: wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn	27 Apr 2019 20:19:32 -0000	1.1
+++ wikisrc/tutorials/how_netbsd_boots_on_x86.mdwn	8 Sep 2020 21:05:59 -0000	1.2
@@ -84,8 +84,8 @@
 
 ##  References
 
-  * [boot(8)](http://netbsd.gw.com/cgi-bin/man-cgi?boot+8+NetBSD-current)
-  * [fdisk(8)](http://netbsd.gw.com/cgi-bin/man-cgi?fdisk+8+NetBSD-current)
-  * [installboot(8)](http://netbsd.gw.com/cgi-bin/man-cgi?installboot+8+NetBSD-current)
-  * [mbr(8)](http://netbsd.gw.com/cgi-bin/man-cgi?mbr+8+NetBSD-current)
+  * [boot(8)](//man.NetBSD.org/boot.8)
+  * [fdisk(8)](//man.NetBSD.org/fdisk.8)
+  * [installboot(8)](//man.NetBSD.org/installboot.8)
+  * [mbr(8)](//man.NetBSD.org/mbr.8)
 
Index: wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn	6 Apr 2019 01:22:03 -0000	1.3
+++ wikisrc/tutorials/how_to_blank_and_unblank_screens_on_lid_close__92__open.mdwn	8 Sep 2020 21:05:59 -0000	1.4
@@ -1,8 +1,8 @@
-The [powerd(8)](http://netbsd.gw.com/cgi-bin/man-cgi?powerd+8+NetBSD-current) daemon acts upon power management events posted by the kernel's power management facility, translating the events into a script name and arguments. These scripts are found in `/etc/powerd/scripts/`. 
+The [powerd(8)](//man.NetBSD.org/powerd.8) daemon acts upon power management events posted by the kernel's power management facility, translating the events into a script name and arguments. These scripts are found in `/etc/powerd/scripts/`. 
 
 The `lid_switch` script is called on lid-open and -close events. An event of `pressed` means the lid has been closed, and `released` that the lid has been opened. 
 
-The following `lid_switch` uses [xset(1)](http://netbsd.gw.com/cgi-bin/man-cgi?xset+1+NetBSD-current) to forcibly blank the screen on lid-close, and refresh the screen on lid-open: 
+The following `lid_switch` uses [xset(1)](//man.NetBSD.org/xset.1) to forcibly blank the screen on lid-close, and refresh the screen on lid-open: 
     
 [[!template id=programlisting text="""
     #!/bin/sh
Index: wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn	8 Apr 2019 20:47:15 -0000	1.4
+++ wikisrc/tutorials/how_to_gather_network_information_on_netbsd.mdwn	8 Sep 2020 21:05:59 -0000	1.5
@@ -18,7 +18,7 @@
 
 #dmesg
 
-Use [dmesg](http://netbsd.gw.com/cgi-bin/man-cgi?dmesg++NetBSD-current) to obtain information about network adapters on the NetBSD machine:
+Use [dmesg](//man.NetBSD.org/dmesg) to obtain information about network adapters on the NetBSD machine:
 
     $ dmesg | more  
     $ less /var/run/dmesg.boot  
@@ -75,7 +75,7 @@
 
 #ping

(Diff truncated)
transparent favicon
Index: wikisrc/favicon.ico
===================================================================
RCS file: /cvsroot/wikisrc/favicon.ico,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
Binary files /tmp/cvsGDjIk0 and /tmp/cvsNJOJ4T differ

pinebook pro cpu affinity notes
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wikisrc/laptops.mdwn	7 Sep 2020 07:58:16 -0000	1.25
+++ wikisrc/laptops.mdwn	7 Sep 2020 13:34:13 -0000	1.26
@@ -201,7 +201,7 @@
 * The CPU frequency can be adjusted with `sysctl machdep.cpufreq.*`.
 * Mesa llvmpipe is currently used for 3D/OpenGL.
 
-## Pinebook Pro
+## Pinebook Pro (Rockchip RK3399)
 
 * [[!template id=man name="uvideo" section="4"]] webcam works.
 * Internal Broadcom WiFi is supported via the [[!template id=man name="bwfm" section="4"]] driver in -current.
@@ -210,3 +210,10 @@
 * The display backlight can be adjusted with `sysctl`.
 * Mesa llvmpipe is currently used for 3D/OpenGL.
 * Connecting external monitors does not currently work through USB-C.
+
+### Pinebook Pro CPU affinity
+
+After setting `security.models.extensions.user_set_cpu_affinity=1` in `/etc/sysctl.conf`,
+you can run an intensive command on only the "big" CPUs:
+
+`$ schedctl -A 4,5 make package`

note accelerated graphics more
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/laptops.mdwn	6 Sep 2020 23:54:56 -0000	1.24
+++ wikisrc/laptops.mdwn	7 Sep 2020 07:58:16 -0000	1.25
@@ -146,6 +146,7 @@
 
 From user reports, in NetBSD 9.0:
 
+* Accelerated graphics with the i915 driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwn" section="4"]] driver.
 
@@ -169,10 +170,9 @@
 
 ## Thinkpad X260
 
-Likely very similar to the X250.
-
 From user reports, in NetBSD 9.0:
 
+* Accelerated graphics with the i915 driver.
 * SD card reader is supported through the [[!template id=man name="rtsx" section="4"]] driver.
 * Ethernet is supported through the [[!template id=man name="wm" section="4"]] driver.
 * WiFi is supported through the [[!template id=man name="iwm" section="4"]] driver.

afterboot contains information about non-WPA now
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/laptops.mdwn	6 Sep 2020 23:52:46 -0000	1.23
+++ wikisrc/laptops.mdwn	6 Sep 2020 23:54:56 -0000	1.24
@@ -61,10 +61,7 @@
 
 See the
 [[!template id=man name="afterboot" section="8"]] man page for details
-on connecting to a WPA network.  For connecting to a non-WPA network,
-simply specify `ssid networkname up` in 
-[[!template id=man name="ifconfig" section="8"]], and make sure
-[[!template id=man name="dhcpcd" section="8"]] is running.
+on connecting to WiFi networks.
 
 USB 11n WiFi adapters such as
 [[!template id=man name="urtwn" section="4"]] and

updates
Index: wikisrc/laptops.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/laptops.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/laptops.mdwn	18 Jul 2020 11:37:30 -0000	1.22
+++ wikisrc/laptops.mdwn	6 Sep 2020 23:52:46 -0000	1.23
@@ -168,8 +168,7 @@
   xrandr in your window manager.
 * Webcam will depend on upcoming xhci isochronous pipe support.
 * To record from the internal mic, set `mixerctl -w record.source=ADC02`
-* Wakes up after suspend. I have mine set to suspend on lid close with
-  powerd.
+* Suspend and resume work.
 
 ## Thinkpad X260
 
@@ -183,6 +182,7 @@
 * For the extra trackpoint buttons to work correctly, needs a patch to
   synaptics.c that is in -current and will be in 9.1.
   Tapping and the clickpad have always been fine.
+* Suspend and resume work.
 
 ---
 
@@ -207,7 +207,7 @@
 ## Pinebook Pro
 
 * [[!template id=man name="uvideo" section="4"]] webcam works.
-* Internal Broadcom WiFi is supported via the [[!template id=man name="bwfm" section="4"]] driver in 9_STABLE.
+* Internal Broadcom WiFi is supported via the [[!template id=man name="bwfm" section="4"]] driver in -current.
   External adapters may still be more stable.
 * The CPU frequency can be adjusted automatically with `estd` or with `sysctl machdep.cpufreq.*`.
 * The display backlight can be adjusted with `sysctl`.

Some spelling and grammar fixes, and add some markup around links.
Index: wikisrc/ports/evbarm/raspberry_pi.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/raspberry_pi.mdwn,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- wikisrc/ports/evbarm/raspberry_pi.mdwn	19 Jun 2020 13:15:51 -0000	1.129
+++ wikisrc/ports/evbarm/raspberry_pi.mdwn	5 Sep 2020 12:54:33 -0000	1.130
@@ -1,6 +1,6 @@
 [[!meta title="NetBSD/evbarm on Raspberry Pi"]]
 
-This page describes the NetBSD/evbarm port on [Raspberry Pi](http://www.raspberrypi.org) hardware.  All [board variants](https://en.wikipedia.org/wiki/Raspberry_Pi#Specifications) earlier than the RPI4 are believed supported, and specific boards known to work are listed.  We use e.g. "RPI2" to refer to "Raspberry Pi 2" to save precious bytes on this page.  This web page is still 32-bit (aarch32) centric, even though as of mid 2020 aarch64 is also a normal approach.
+This page describes the NetBSD/evbarm port on [Raspberry Pi](http://www.raspberrypi.org) hardware.  All [board variants](https://en.wikipedia.org/wiki/Raspberry_Pi#Specifications) earlier than the RPI4 are believed supported, and specific boards known to work are listed.  We use e.g. "RPI2" to refer to "Raspberry Pi 2" to save precious bytes on this page.  This web page is still 32-bit (aarch32) centric, even though as of mid-2020 aarch64 is also a normal approach.
 
 Initial, limited, Raspberry Pi support was introduced in NetBSD 6.0.  NetBSD 7.0 added complete support for the board, along with introducing support for the quad-core Raspberry Pi 2 board.  Raspberry Pi 3 support was added for NetBSD 8.  NetBSD 9 supports aarch64, meaning using the newer processors in 64-bit mode (via -current in mid 2018).
 
@@ -78,7 +78,7 @@
 
 In theory the code compiled for earmv7hf will be faster, but anecdotal experience is that it doesn't matter that much.  \todo Post a link to a quality benchmark.
 
-While the evbarm port has "eb" variants (for big-endian mode), the RPI systems do not support eb and these variants will not work.  Systems built with older CPU architectures (earm, earmv4, earmv5) are not expected to work on RPI.
+While the evbarm port has "eb" variants (for big-endian mode), the RPI systems do not support eb and these variants will not work.  Systems built for older CPU architectures (earm, earmv4, earmv5) are not expected to work on RPI.
 
 The RPI2-1.2 and RPI3 have an armv8 CPU that supports aarch64 (64-bit
 mode) in addition to aarch32 (regular 32-bit ARM).  This is supported,
@@ -93,7 +93,7 @@
 The Raspberry Pi looks for firmware and kernel.img on the first FAT32 MBR partition of the uSD card.  A separate kernel (kernel7.img) is used on RPI2 and RPI3.
 The NetBSD kernel will then find NetBSD MBR partition and within that the root disklabel partition, and use that FFS partition as the root filesystem.
 
-A 2 GB card is the smallest workable size, and the installation image will fit.  After the first boot, the system resizes the NetBSD root partition to fill the card.  Note that swap is after /boot and before /, and not contained in the NetBSD fdisk partition.  However, if you don't try to change the partition structure, this should not cause you any trouble.
+A 2 GB card is the smallest workable size that the installation image will fit on.  After the first boot, the system resizes the NetBSD root partition to fill the card.  Note that swap is after /boot and before /, and not contained in the NetBSD fdisk partition.  However, if you don't try to change the partition structure, this should not cause you any trouble.
 
 Note that SD cards generally have limited write tolerance, so you may wish to disable atime updates via the noatime option, as is done by the default installation.
 
@@ -121,7 +121,7 @@
 
 NetBSD provides nightly builds on [nycdn.netbsd.org](https://nycdn.netbsd.org/pub/NetBSD-daily/).  The next directory level is the branch being built (netbsd-7, netbsd-8, HEAD, and more), plus optionally things like compiler type.  It is followed by date/time, e.g. "HEAD/201811051650Z"; once a build is complete the symlink "latest" is adjusted to point to it.  The next level is "${MACHINE}-${MACHINE_ARCH}", e.g. "evbarm-earmv7hf", and multiple combinations are provided.
 
-An example URL, arguably the standard approach for first-time NetBSD/RPI users, is https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-8/latest/evbarm-earmv7hf/binary/gzimg/
+An example URL, arguably the standard approach for first-time NetBSD/RPI users, is <https://nycdn.netbsd.org/pub/NetBSD-daily/netbsd-8/latest/evbarm-earmv7hf/binary/gzimg/>
 
 ### release layout
 
@@ -162,7 +162,7 @@
 
  - Connect an Ethernet cable from the RPI to a LAN with a DHCP server, and another host you can use for ssh.
  - Power on the RPI, and wait.  Watch the logs on the DHCP server, and find the IP address assigned to the RPI.
- - Use ssh to login to the address you found with user "sysinst", and password "netbsd".
+ - Use ssh to log in to the address you found with user "sysinst", and password "netbsd".
  - When installing, ensure that you enable DHCP and ssh, so that you can log in again after the system is installed.
 
 The rpi_inst.img.gz image will only work for systems that use earmv6hf kernels (so not RPI2/3).  See [this port-arm message](https://mail-index.netbsd.org/port-arm/2017/08/18/msg004374.html) for details.
@@ -189,7 +189,7 @@
 
 The following pages have been published by NetBSD community members.  (Note that some of them are old.)
 
- - https://www.cambus.net/netbsd-on-the-raspberry-pi/
+ - <https://www.cambus.net/netbsd-on-the-raspberry-pi/>
 
 # Maintaining a system
 
@@ -234,7 +234,7 @@
 
 An alternate approach is to have the boot FAT32 partition as above, but to have the entire system including root on an external disk.  This is configured by changing root=ld0a to root=sd0a or root=dk0 (depending on disklabel/GPT).  Besides greater space, part of the point is to avoid writing to the uSD card.
 
-A third approach, workable on the Pi 3 only, is to configure USB host booting (already enableed on the 3+; see the upstream documentation) and have the boot partition also on the external device.  In this case the external device must have an MBR because the hardware's first-stage boot does not have GPT support. In theory the [procedure to program USB host boot mode](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md) will function on a NetBSD system because the programming is done by bootcode.bin.
+A third approach, workable on the Pi 3 only, is to configure USB host booting (already enabled on the 3+; see the upstream documentation) and have the boot partition also on the external device.  In this case the external device must have an MBR because the hardware's first-stage boot does not have GPT support. In theory the [procedure to program USB host boot mode](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bootmodes/msd.md) will function on a NetBSD system because the programming is done by bootcode.bin.
 \todo Confirm that putting program_usb_boot_mode=1 in config.txt and booting works to program the OTP bit.  Confirm that one can then boot NetBSD from external USB.
 
 There is no well-defined USB enumeration order, so the preferred approach if one has multiple USB mass storage devices is to use named wedges in both fstab and cmdline.txt.
@@ -243,7 +243,7 @@
 
 \todo Verify this, and add any necessary cautions about boot code.
 
-The aarch64 kernel can run aarch32 binaries, so one can boot a aarch64 kernel on a system with aarch32 userland.
+The aarch64 kernel can run aarch32 binaries, so one can boot an aarch64 kernel on a system with an aarch32 userland.
 
 # X11 and GPU
 

"pkgin full-upgrade" is deprecated, as there's no longer any meaningful
distinction between "full-upgrade" and "upgrade". (This has been true
for the pkgin versions included in the last four quarterly pkgsrc
releases, so it seems safe to change this now.)
Index: wikisrc/pkgsrc/how_to_upgrade_packages.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/how_to_upgrade_packages.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/pkgsrc/how_to_upgrade_packages.mdwn	12 Feb 2020 10:00:36 -0000	1.7
+++ wikisrc/pkgsrc/how_to_upgrade_packages.mdwn	31 Aug 2020 18:11:49 -0000	1.8
@@ -19,7 +19,7 @@
 To update all installed packages, just run
 
 	pkgin update
-	pkgin full-upgrade
+	pkgin upgrade
 
 
 ## pkg_add -uu

Set a tentative date for 9.1
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wikisrc/releng.mdwn	16 Jun 2020 08:15:36 -0000	1.41
+++ wikisrc/releng.mdwn	30 Aug 2020 11:56:55 -0000	1.42
@@ -14,7 +14,7 @@
 
 ### NetBSD 9.x
 
-* Next minor release: NetBSD 9.1 (no schedule)
+* Next minor release: NetBSD 9.1 (tentative release date: September 24)
   + CVS branch tag: <code>netbsd-9</code>
 * [Current pull-up queue for the netbsd-9 branch](http://releng.netbsd.org/cgi-bin/req-9.cgi)
 

Define `install_image' variable to point to the USB images like
index.html of www.NetBSD.org.
Index: wikisrc/ports/amd64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amd64.mdwn,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- wikisrc/ports/amd64.mdwn	15 Feb 2020 08:00:05 -0000	1.30
+++ wikisrc/ports/amd64.mdwn	25 Aug 2020 16:55:52 -0000	1.31
@@ -1,5 +1,6 @@
 [[!template id=port
 port="amd64"
+install_image="uefi-install"
 cur_rel="9.0"
 future_rel="10.0"
 pkg_rel="8.0"
Index: wikisrc/ports/i386.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/i386.mdwn,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wikisrc/ports/i386.mdwn	15 Feb 2020 08:00:06 -0000	1.21
+++ wikisrc/ports/i386.mdwn	25 Aug 2020 16:55:52 -0000	1.22
@@ -1,5 +1,6 @@
 [[!template id=port
 port="i386"
+install_image="install"
 cur_rel="9.0"
 future_rel="10.0"
 pkg_rel="8.0"

Add install_image variable intended to be used for USB images (currently
provided by amd64 and i386)
It should be defined to the corresponding suffix, e.g. `install' (i386/amd64) or
`uefi-install' (amd64).
Members: 
	templates/port.mdwn:1.28->1.29 

Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- wikisrc/templates/port.mdwn	25 Aug 2020 16:40:05 -0000	1.28
+++ wikisrc/templates/port.mdwn	25 Aug 2020 16:53:32 -0000	1.29
@@ -103,6 +103,13 @@
           NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> ISO
         </a>
       </li>
+      <TMPL_IF install_image>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port> USB image" href="https://cdn.NetBSD.org/pub/NetBSD/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR install_image>.img.gz">
+            NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> USB image
+          </a>
+        </li>
+      </TMPL_IF>
     </TMPL_IF>
   </TMPL_IF>
   <TMPL_UNLESS no_install_notes>
@@ -256,6 +263,7 @@
 - port (required)
 - port_alt (optional)
 - port_var[1-7] (optional)
+- install_image (optional)
 - port_var_install_notes (optional)
 - about (required)
 - cur_rel (optional)

Fix a copypasto in the ISO anchor for non-port_var-s ports
Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- wikisrc/templates/port.mdwn	25 Aug 2020 16:34:20 -0000	1.27
+++ wikisrc/templates/port.mdwn	25 Aug 2020 16:40:05 -0000	1.28
@@ -99,7 +99,7 @@
         </a>
       </li>
       <li>
-        <a title="NetBSD/<TMPL_VAR port> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR cur_rel>/<TMPL_VAR port>.iso">
+        <a title="NetBSD/<TMPL_VAR port> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>.iso">
           NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> ISO
         </a>
       </li>

Add direct anchors to ISO(s)
Suggested by <kim> and <martin>, thanks!
Members: 
	templates/port.mdwn:1.26->1.27 

Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wikisrc/templates/port.mdwn	23 May 2020 13:02:15 -0000	1.26
+++ wikisrc/templates/port.mdwn	25 Aug 2020 16:34:20 -0000	1.27
@@ -15,12 +15,22 @@
             NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var1>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       <TMPL_IF port_var2>
         <li>
           <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> download" href="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> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var2>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       </TMPL_IF>
       <TMPL_IF port_var3>
         <li>
@@ -28,6 +38,11 @@
             NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var3>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var3> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       </TMPL_IF>
       <TMPL_IF port_var4>
         <li>
@@ -35,6 +50,11 @@
             NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var4>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var4> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       </TMPL_IF>
       <TMPL_IF port_var5>
         <li>
@@ -42,6 +62,11 @@
             NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var5>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var5> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       </TMPL_IF>
       <TMPL_IF port_var6>
         <li>
@@ -49,6 +74,11 @@
             NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var6>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var6> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       </TMPL_IF>
       <TMPL_IF port_var7>
         <li>
@@ -56,6 +86,11 @@
             NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> via download
           </a>
         </li>
+        <li>
+          <a title="NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR port>-<TMPL_VAR port_var7>.iso">
+            NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var7> <TMPL_VAR cur_rel> ISO
+          </a>
+        </li>
       </TMPL_IF>
     <TMPL_ELSE>
       <li>
@@ -63,6 +98,11 @@
           NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via download
         </a>
       </li>
+      <li>
+        <a title="NetBSD/<TMPL_VAR port> ISO" href="https://cdn.NetBSD.org/pub/NetBSD/images/NetBSD-<TMPL_VAR cur_rel>-<TMPL_VAR cur_rel>/<TMPL_VAR port>.iso">
+          NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> ISO
+        </a>
+      </li>
     </TMPL_IF>
   </TMPL_IF>
   <TMPL_UNLESS no_install_notes>

More useful advice for GENERIC
Index: wikisrc/guide/cgd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/cgd.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/guide/cgd.mdwn	19 Jun 2015 19:18:31 -0000	1.5
+++ wikisrc/guide/cgd.mdwn	12 Aug 2020 16:00:48 -0000	1.6
@@ -70,13 +70,11 @@
 ### Kernel driver pseudo-device
 
 To use `cgd` you need a kernel with support for the `cgd` pseudo-device. Make
-sure the following line is in the kernel configuration file:
+sure the module is loaded:
 
-    pseudo-device   cgd     4       # cryptographic disk driver
+    modload cgd
 
-The number specifies how many `cgd` devices may be configured at the same time.
-After configuring the `cgd` pseudo-device you can recompile the kernel and boot
-it to enable `cgd` support.
+If the cgd driver was not already present/loaded, add `cgd` to `/etc/modules.conf`.
 
 ### Ciphers
 

Remove, no longer referenced
--- wikisrc/community.mdwn	2020-08-09 13:51:37.099021514 +0000
+++ /dev/null	2020-08-09 13:51:02.631784853 +0000
@@ -1,40 +0,0 @@
-[[!meta title="Community"]]
-
-# NetBSD Community
-
-Get in contact with other NetBSD users. Ask for help or share your experience and technical knowledge. Explore the activities and resources of the NetBSD community.
-
-## Mailing lists
-
-NetBSD "happens" primarily on [mailing lists](//www.NetBSD.org/mailinglists/).  You are encouraged to join, at least, [netbsd-users](//www.NetBSD.org/mailinglists/#netbsd-users), [netbsd-announce](//www.NetBSD.org/mailinglists/#netbsd-announce), and [current-users](//www.NetBSD.org/mailinglists/#current-users) if you are running NetBSD-current.
-
-## Social media
-
-* [Follow us on Twitter](https://www.twitter.com/netbsd)
-
-## Internet Relay Chat
-
-NetBSD channels are available on the following IRC networks:
-
-* Channel [#NetBSD](https://webchat.freenode.net/?channels=#NetBSD) on [freenode](https://freenode.net/)
-* Channel [#NetBSD-code](https://webchat.freenode.net/?channels=#NetBSD-code) on [freenode](https://freenode.net/)
-* Channel [#pkgsrc](https://webchat.freenode.net/?channels=#pkgsrc) on [freenode](https://freenode.net/)
-* Channel #NetBSD on [IRCnet](http://www.ircnet.info/)
-* Channel #NetBSD on [EFnet](http://www.efnet.org/)
-
-## Internet forums, discussion groups, etc
-
-* [/r/NetBSD on Reddit](https://www.reddit.com/r/NetBSD)
-* [NetBSD on UnitedBSD](https://www.unitedbsd.com/t/netbsd)
-* [Daemon Forums](http://www.daemonforums.org/)
-
-## Usenet newsgroups
-
-* [comp.unix.bsd.netbsd.announce](news:comp.unix.bsd.netbsd.announce)
-* [comp.unix.bsd.netbsd.misc](news:comp.unix.bsd.netbsd.misc)
-* [comp.unix.bsd.misc](news:comp.unix.bsd.misc)
-
-## User groups and regional resources
-
-[User groups and other regional resources of the NetBSD community](https://www.netbsd.org/community/groups.html)
-

Unreference `Community', same information already present in `Community'
sidebar.
Index: wikisrc/index.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/index.mdwn,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- wikisrc/index.mdwn	6 Aug 2020 09:44:57 -0000	1.67
+++ wikisrc/index.mdwn	9 Aug 2020 13:48:30 -0000	1.68
@@ -22,7 +22,6 @@
 * [[releng]] -- Release engineering
 * [[Security|security]] -- Security features and hardening
 * [[Users]] -- Developer sandbox pages
-* [[Community|community]] -- Known community resources
 * [[GitHub|github]] -- NetBSD on GitHub
 * [[Amazon EC2|amazon_ec2]] -- NetBSD on amazon's EC2
 * [[Laptops|laptops]] -- Information about laptop hardware support

Add a `Mailing lists' anchor under `Support'
Mailing lists are the main communication channel for NetBSD and pkgsrc.
Based on various netbsd-users@ reports reporting that mailing lists information
were difficult to find.
Based on various netbsd-users@ reports reporting that mailing lists information
were difficult to find.

Members: 
	templates/page.tmpl:1.65->1.66 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- wikisrc/templates/page.tmpl	9 Aug 2020 12:40:30 -0000	1.65
+++ wikisrc/templates/page.tmpl	9 Aug 2020 12:47:47 -0000	1.66
@@ -104,6 +104,8 @@
 		  Support</a><ul>
 	<li><a href="//www.NetBSD.org/community/">
 		    Community</a></li>
+	<li><a href="//www.NetBSD.org/mailinglists/">
+		    Mailing lists</a></li>
 	<li><a href="//www.NetBSD.org/support/send-pr.html">
 		    Bug reports</a></li>
 	<li><a href="//www.NetBSD.org/support/security/">

Switch the `Community' anchor back to htdocs
In htdocs there is also the groups page (`NetBSD user groups and regional
resources').
Both `NetBSD Community' (index.xml in htdocs and community.mdwn) and `NetBSD
user groups and regional resources' are rarely edited and having them in wikisrc
probably don't buy us much.
Members: 
	templates/page.tmpl:1.64->1.65 

Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- wikisrc/templates/page.tmpl	30 Jul 2020 08:49:47 -0000	1.64
+++ wikisrc/templates/page.tmpl	9 Aug 2020 12:40:30 -0000	1.65
@@ -102,7 +102,7 @@
 	<li>
 	<a href="//www.NetBSD.org/support/">
 		  Support</a><ul>
-	<li><a href="//wiki.NetBSD.org/community/">
+	<li><a href="//www.NetBSD.org/community/">
 		    Community</a></li>
 	<li><a href="//www.NetBSD.org/support/send-pr.html">
 		    Bug reports</a></li>

mmap bug
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wikisrc/releng/netbsd-10.mdwn	6 Aug 2020 17:55:36 -0000	1.21
+++ wikisrc/releng/netbsd-10.mdwn	6 Aug 2020 18:34:31 -0000	1.22
@@ -16,6 +16,7 @@
 * [[!template id=pr number=54771]]: nvme(4) fails to attach
 * [[!template id=pr number=55042]]: kernel panics when ZFS filesystem is exported with NFS
 * [[!template id=pr number=55458]]: entropy: WrAnRdNcING no nstropy in  eed
+* [[!template id=pr number=55533]]: mmap(2) fails when called with a non-zero hint
 
 Regressions since netbsd-9:
 

add zfs-nfs panic bug
Index: wikisrc/releng/netbsd-10.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/netbsd-10.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/releng/netbsd-10.mdwn	21 Jul 2020 20:43:02 -0000	1.20
+++ wikisrc/releng/netbsd-10.mdwn	6 Aug 2020 17:55:36 -0000	1.21
@@ -14,6 +14,7 @@
 * [[!template id=pr number=54727]]: writing a large file causes unreasonable system behaviour (should be fixed, needs to be checked)
 * [[!template id=pr number=54761]]: nvme corruption on GENERIC without DIAGNOSTIC
 * [[!template id=pr number=54771]]: nvme(4) fails to attach
+* [[!template id=pr number=55042]]: kernel panics when ZFS filesystem is exported with NFS
 * [[!template id=pr number=55458]]: entropy: WrAnRdNcING no nstropy in  eed
 
 Regressions since netbsd-9: