Recent changes to this wiki:

add a kernel project
Index: wikisrc/ports/sparc64/projects.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64/projects.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/ports/sparc64/projects.mdwn	1 Jul 2015 09:29:57 -0000	1.1
+++ wikisrc/ports/sparc64/projects.mdwn	1 Jul 2015 09:31:10 -0000	1.2
@@ -5,6 +5,7 @@
 ### Kernel
 
 * Sun4v: Support for T1000 - T5000 is beeing worked on
+* Make sure registers %g6 and %g7 are free in all kernel asm code and use them for curlwp/curcpu
 * Cleanup locore.s: Locore.s needs a cleanup.
 * KGDB: The code for kgdb needs to be fixed back up.
 * IOMMU: The iommu code may be a performance bottleneck. This needs to be investigated.

rename ports/ports/sparc64/projects.mdwn to ports/sparc64/projects.mdwn
--- wikisrc/ports/ports/sparc64/projects.mdwn	2015-07-01 09:30:00.000000000 +0000
+++ /dev/null	2015-07-01 09:20:01.000000000 +0000
@@ -1,22 +0,0 @@
-[[!meta title="NetBSD/sparc64 Projects"]]
-
-This is a list of ongoing projects, or projects that are waiting for volunteers to pick them up.
-
-### Kernel
-
-* Sun4v: Support for T1000 - T5000 is beeing worked on
-* Cleanup locore.s: Locore.s needs a cleanup.
-* KGDB: The code for kgdb needs to be fixed back up.
-* IOMMU: The iommu code may be a performance bottleneck. This needs to be investigated.
-
-### Drivers
-
-Some drivers for hardware found in sparc64 machines are still missing:
-
-* floppy drive (for EBus based machines)
-* smart card reader (found in Blade/Netra systems)
-* console processor (to allow (a)lom configuration from within NetBSD)
-
-### Userland
-
-Currently there are no open userland projects.
--- /dev/null	2015-07-01 09:20:01.000000000 +0000
+++ wikisrc/ports/sparc64/projects.mdwn	2015-07-01 09:30:00.000000000 +0000
@@ -0,0 +1,22 @@
+[[!meta title="NetBSD/sparc64 Projects"]]
+
+This is a list of ongoing projects, or projects that are waiting for volunteers to pick them up.
+
+### Kernel
+
+* Sun4v: Support for T1000 - T5000 is beeing worked on
+* Cleanup locore.s: Locore.s needs a cleanup.
+* KGDB: The code for kgdb needs to be fixed back up.
+* IOMMU: The iommu code may be a performance bottleneck. This needs to be investigated.
+
+### Drivers
+
+Some drivers for hardware found in sparc64 machines are still missing:
+
+* floppy drive (for EBus based machines)
+* smart card reader (found in Blade/Netra systems)
+* console processor (to allow (a)lom configuration from within NetBSD)
+
+### Userland
+
+Currently there are no open userland projects.

move "projects" to the wiki
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/ports/sparc64.mdwn	1 Jul 2015 09:19:11 -0000	1.13
+++ wikisrc/ports/sparc64.mdwn	1 Jul 2015 09:28:37 -0000	1.14
@@ -82,10 +82,10 @@
 
 * For older 32 bit SPARC-based machines, see [NetBSD/sparc](../sparc/).
 * [NetBSD/sparc64 FAQ](http://www.NetBSD.org/ports/sparc64/faq.html)
-* [[ports/sparc64/Sparc64_istory]]
+* [[NetBSD/sparc64 History|ports/sparc64/sparc64_history]]
 * The [NetBSD Diskless HOWTO](http://www.NetBSD.org/docs/network/netboot/)
 * [Developers and Development Funding](http://www.NetBSD.org/ports/sparc64/development.html)
-* [NetBSD/sparc64 Projects](http://www.NetBSD.org/ports/sparc64/projects.html)
+* [[NetBSD/sparc64 Projects|ports/sparc64/projects]]
 * [Running NetBSD on emulated hardware](http://www.NetBSD.org/ports/emulators.html)
 """
 ]]

import and update "projects" page
--- /dev/null	2015-07-01 09:20:01.000000000 +0000
+++ wikisrc/ports/ports/sparc64/projects.mdwn	2015-07-01 09:27:38.000000000 +0000
@@ -0,0 +1,22 @@
+[[!meta title="NetBSD/sparc64 Projects"]]
+
+This is a list of ongoing projects, or projects that are waiting for volunteers to pick them up.
+
+### Kernel
+
+* Sun4v: Support for T1000 - T5000 is beeing worked on
+* Cleanup locore.s: Locore.s needs a cleanup.
+* KGDB: The code for kgdb needs to be fixed back up.
+* IOMMU: The iommu code may be a performance bottleneck. This needs to be investigated.
+
+### Drivers
+
+Some drivers for hardware found in sparc64 machines are still missing:
+
+* floppy drive (for EBus based machines)
+* smart card reader (found in Blade/Netra systems)
+* console processor (to allow (a)lom configuration from within NetBSD)
+
+### Userland
+
+Currently there are no open userland projects.

rename to all lowercase and add title
Index: wikisrc/ports/sparc64/sparc64_history.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64/sparc64_history.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/ports/sparc64/sparc64_history.mdwn	1 Jul 2015 09:20:01 -0000	1.1
+++ wikisrc/ports/sparc64/sparc64_history.mdwn	1 Jul 2015 09:20:29 -0000	1.2
@@ -1,3 +1,5 @@
+[[!meta title="NetBSD/sparc64 History"]]
+
 The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
 
 The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.

rename ports/sparc64/sparc64__95__history.mdwn to ports/sparc64/sparc64_history.mdwn
--- wikisrc/ports/sparc64/sparc64__95__history.mdwn	2015-07-01 09:20:03.000000000 +0000
+++ /dev/null	2015-07-01 09:20:01.000000000 +0000
@@ -1,16 +0,0 @@
-The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
-
-The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
-
-In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
-
-In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
-
-In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
-
-2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
-
-The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
-
-In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
-
--- /dev/null	2015-07-01 09:20:01.000000000 +0000
+++ wikisrc/ports/sparc64/sparc64_history.mdwn	2015-07-01 09:20:03.000000000 +0000
@@ -0,0 +1,16 @@
+The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
+
+The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
+
+In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
+
+In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
+
+In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
+
+2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
+
+The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
+
+In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
+

rename ports/sparc64/sparc64__95__istory.mdwn to ports/sparc64/sparc64__95__history.mdwn
--- /dev/null	2015-07-01 09:16:00.000000000 +0000
+++ wikisrc/ports/sparc64/sparc64__95__history.mdwn	2015-07-01 09:19:34.000000000 +0000
@@ -0,0 +1,16 @@
+The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
+
+The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
+
+In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
+
+In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
+
+In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
+
+2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
+
+The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
+
+In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
+
--- wikisrc/ports/sparc64/sparc64__95__istory.mdwn	2015-07-01 09:19:35.000000000 +0000
+++ /dev/null	2015-07-01 09:16:00.000000000 +0000
@@ -1,16 +0,0 @@
-The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
-
-The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
-
-In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
-
-In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
-
-In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
-
-2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
-
-The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
-
-In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
-

update for rename of ports/sparc64/NetBSD_sparc64_History.mdwn to ports/sparc64/sparc64__95__istory.mdwn
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/ports/sparc64.mdwn	1 Jul 2015 09:13:29 -0000	1.12
+++ wikisrc/ports/sparc64.mdwn	1 Jul 2015 09:19:11 -0000	1.13
@@ -82,7 +82,7 @@
 
 * For older 32 bit SPARC-based machines, see [NetBSD/sparc](../sparc/).
 * [NetBSD/sparc64 FAQ](http://www.NetBSD.org/ports/sparc64/faq.html)
-* [[NetBSD sparc64 History]]
+* [[ports/sparc64/Sparc64_istory]]
 * The [NetBSD Diskless HOWTO](http://www.NetBSD.org/docs/network/netboot/)
 * [Developers and Development Funding](http://www.NetBSD.org/ports/sparc64/development.html)
 * [NetBSD/sparc64 Projects](http://www.NetBSD.org/ports/sparc64/projects.html)

rename ports/sparc64/NetBSD_sparc64_History.mdwn to ports/sparc64/sparc64__95__istory.mdwn
--- wikisrc/ports/sparc64/NetBSD_sparc64_History.mdwn	2015-07-01 09:19:14.000000000 +0000
+++ /dev/null	2015-07-01 09:16:00.000000000 +0000
@@ -1,16 +0,0 @@
-The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
-
-The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
-
-In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
-
-In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
-
-In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
-
-2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
-
-The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
-
-In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
-
--- /dev/null	2015-07-01 09:16:00.000000000 +0000
+++ wikisrc/ports/sparc64/sparc64__95__istory.mdwn	2015-07-01 09:19:14.000000000 +0000
@@ -0,0 +1,16 @@
+The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
+
+The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
+
+In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
+
+In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
+
+In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
+
+2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
+
+The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
+
+In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
+

Move history over to the wiki
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/ports/sparc64.mdwn	30 Jun 2015 15:05:06 -0000	1.11
+++ wikisrc/ports/sparc64.mdwn	1 Jul 2015 09:13:29 -0000	1.12
@@ -17,7 +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_netbsd32(8)](http://netbsd.gw.com/cgi-bin/man-cgi?compat_netbsd32+8+NetBSD-5.1+i386)
+- but this is [currently broken!](http://gnats.netbsd.org/46274),
 [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).
 
 Martin Husemann is the maintainer for NetBSD/sparc64.
@@ -81,7 +82,7 @@
 
 * For older 32 bit SPARC-based machines, see [NetBSD/sparc](../sparc/).
 * [NetBSD/sparc64 FAQ](http://www.NetBSD.org/ports/sparc64/faq.html)
-* [NetBSD/sparc64 History](http://www.NetBSD.org/ports/sparc64/history.html)
+* [[NetBSD sparc64 History]]
 * The [NetBSD Diskless HOWTO](http://www.NetBSD.org/docs/network/netboot/)
 * [Developers and Development Funding](http://www.NetBSD.org/ports/sparc64/development.html)
 * [NetBSD/sparc64 Projects](http://www.NetBSD.org/ports/sparc64/projects.html)

rename ports/NetBSD/sparc64_History.mdwn to ports/sparc64/NetBSD_sparc64_History.mdwn
--- wikisrc/ports/NetBSD/sparc64_History.mdwn	2015-07-01 09:12:21.000000000 +0000
+++ /dev/null	2015-07-01 09:10:00.000000000 +0000
@@ -1,16 +0,0 @@
-The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
-
-The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
-
-In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
-
-In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
-
-In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
-
-2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
-
-The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
-
-In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
-
--- /dev/null	2015-07-01 09:10:00.000000000 +0000
+++ wikisrc/ports/sparc64/NetBSD_sparc64_History.mdwn	2015-07-01 09:12:21.000000000 +0000
@@ -0,0 +1,16 @@
+The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
+
+The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
+
+In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
+
+In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
+
+In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
+
+2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
+
+The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
+
+In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
+

Import the old "History" page
--- /dev/null	2015-07-01 09:00:00.000000000 +0000
+++ wikisrc/ports/NetBSD/sparc64_History.mdwn	2015-07-01 09:09:34.000000000 +0000
@@ -0,0 +1,16 @@
+The NetBSD/sparc64 port began with [NetBSD-current](http://www.netbsd.org/releases/current.html) sources from around the [NetBSD 1.2 release](http://www.netbsd.org/releases/formal-1.2/). Taking NetBSD/sparc as a baseline, Eduardo Horvath modified, added or rewrote all that was necessary. NetBSD/sparc64 had its first formal release with [NetBSD 1.5](http://www.netbsd.org/releases/formal-1.5/).
+
+The original binary and source snapshot of NetBSD/sparc64 was made available to the public on January 15, 1999. It supported only the Ultra1 family of workstations, with partial support for the Ultra2 family. The onboard SCSI and Ethernet were not supported for the Ultra2, though Sbus SCSI cards were supported.
+
+In early 2000, Paul Kranenburg committed support for the Happy Meal Ethernet, providing onboard ethernet for the Ultra2.
+
+In mid 2000, Matthew Green, with much help from Eduardo Horvath, committed support for the UltraSPARC IIi-based PCI-based systems (Ultra5, Ultra10, AXi, etc.) Some onboard devices (serial, keyboard and mouse) were not supported until later. Shortly afterwards Paul Kranenburg committed the final support needed for the high-end UltraSPARC PCI-based systems, currently only tested on an Enterprise 250 system. Many more significant bug fixes appeared in the following months.
+
+In October 2000, Eduardo Horvath solved the long-standing problem with Sbus ethernet, allowing Ultra1 and Ultra2 class systems to have usable ethernet.
+
+2001 saw further code sharing with the SPARC port, plus many new devices and systems supported, including the SunBlade 100, and many (smaller) UltraSPARC server machines.
+
+The switch to an in-tree toolchain and lots of small improvements in various areas made the sparc64 port a full-grown port as of the [NetBSD 1.6](http://www.netbsd.org/releases/formal-1.6/) release.
+
+In 2005 the sparc64 port switched over to the generic wscons console framework. Michael Lorenz did most of the work, with support from John Heasley and Martin Husemann. The XFree86 X server was added and replaced Xsun as the default. This brought accelerated consoles and X support for the most common hardware configurations and finally made the sparc64 port usable for desktops.
+

Remove references to the "models" page
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/ports/sparc64.mdwn	15 May 2015 05:38:22 -0000	1.10
+++ wikisrc/ports/sparc64.mdwn	30 Jun 2015 15:05:06 -0000	1.11
@@ -48,8 +48,6 @@
 * Ultra 25 and 45
 * Sun Fire v125, v210, v215, v240, v245, v250, v440, v445, v480
 
-See the [Notes on System Models](http://www.NetBSD.org/ports/sparc64/models.html) page for a complete list.
-
 ### All on-board and most optional Sun brand framebuffers 
 
 * text console on all framebuffers 
@@ -83,7 +81,6 @@
 
 * For older 32 bit SPARC-based machines, see [NetBSD/sparc](../sparc/).
 * [NetBSD/sparc64 FAQ](http://www.NetBSD.org/ports/sparc64/faq.html)
-* [Notes on System Models](http://www.NetBSD.org/ports/sparc64/models.html)
 * [NetBSD/sparc64 History](http://www.NetBSD.org/ports/sparc64/history.html)
 * The [NetBSD Diskless HOWTO](http://www.NetBSD.org/docs/network/netboot/)
 * [Developers and Development Funding](http://www.NetBSD.org/ports/sparc64/development.html)

We are planning a dev summit at EuroBSDCon again
--- /dev/null	2015-06-30 13:00:01.000000000 +0000
+++ wikisrc/summits/EuroBSDCon_2015_NetBSD_Summit.mdwn	2015-06-30 13:02:10.000000000 +0000
@@ -0,0 +1,33 @@
+## Details
+
+There will be a NetBSD developer summit the day before EurBSDCon in Stockholm this year:
+
+Friday, 2015-10-02, at:
+
+    SUNET
+    Tulegatan 11, 3rd floor,
+    Stockholm, Sweeden
+(See [[https://goo.gl/maps/XSlWB]])
+
+Times are not fixed yet, but assume 10:00 to 16:00 for now.
+
+### NetBSD Dinner
+We plan to join the SUNET monthly beer event after the main summit, and later either split up for different meal preferences (optionally meeting again later for more beverages), or, if we can find a place and get enough votes for this option, try to organize a group dinner at some restaurant. Please enter your choice and optional meal preferences in the attandents table below.
+
+## Planning to attend?
+
+[[!table data="""
+First Last | `login@` | prefer group dinner? | meal preferences | comment(s)
+Martin Husemann | martin | yes | eating everything tasty |
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker  |Title
+`login@` |_Very Interesting Thing_
+"""]]
+
+## Discussions
+
+## Varia

first cut at "summit" template
--- /dev/null	2015-06-30 12:50:01.000000000 +0000
+++ wikisrc/templates/summit.mdwn	2015-06-30 12:50:14.000000000 +0000
@@ -0,0 +1,24 @@
+## Details
+
+add description here
+
+### NetBSD Dinner
+
+more description
+
+## Planning to attend?
+
+[[!table data="""
+First Last | `login@` | join dinner? | comment(s)
+"""]]
+
+## Planning to present something?
+
+[[!table data="""
+Speaker  |Title
+`login@` |_Very Interesting Thing_
+"""]]
+
+## Discussions
+
+## Varia

Try to add a "add summit" button on this page
Index: wikisrc/summits.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/summits.mdwn	31 Jul 2014 21:38:41 -0000	1.9
+++ wikisrc/summits.mdwn	30 Jun 2015 12:47:55 -0000	1.10
@@ -3,3 +3,20 @@
 ## Contents
 
 [[!map pages="summits/*" show=title]]
+
+# Add a summit
+
+[[!edittemplate
+template="summit"
+match="summits/*"
+silent=yes
+]]
+
+[[!inline
+pages="empty and pagespec"
+feeds=no
+rootpage="summits"
+postform=yes
+postformtext="Add a new summit page:"
+]]
+

Diskless HOWTO guide does not exist on wiki.NetBSD.org, specify www.NetBSD.org
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- wikisrc/ports/evbarm.mdwn	20 May 2015 03:15:51 -0000	1.21
+++ wikisrc/ports/evbarm.mdwn	20 Jun 2015 22:47:22 -0000	1.22
@@ -295,7 +295,7 @@
 
 """
 additional="""
-  * The [NetBSD Diskless HOWTO](/docs/network/netboot/)
+  * The [NetBSD Diskless HOWTO](http://www.netbsd.org/docs/network/netboot/)
   * [ Porting NetBSD/evbarm to the Arcom Viper](http://www.cs.hut.fi/~pooka/pubs/EuroBSDCon2005/viper.pdf), presented at EuroBSDCon 2005. 
 """
 ]]

No i386 in eu-central
Index: wikisrc/amazon_ec2/amis.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/amazon_ec2/amis.mdwn,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- wikisrc/amazon_ec2/amis.mdwn	20 Jun 2015 21:28:40 -0000	1.44
+++ wikisrc/amazon_ec2/amis.mdwn	20 Jun 2015 21:29:51 -0000	1.45
@@ -245,7 +245,6 @@
   <td>ami-cbde21a0</td><!-- us-east-1 -->
   <td>ami-61926525</td><!-- us-west-1 -->
   <td>ami-6ddadf5d</td><!-- us-west-2 -->
-  <td>ami-3ebf8723</td><!-- eu-central-1 -->
   <td>ami-53c0ba24</td><!-- eu-west-1 -->
   <td>ami-aedfdbfc</td><!-- ap-southeast-1 -->
   <td>ami-dfa5dfe5</td><!-- ap-southeast-2 -->

Replace 7-BETA with 7.0_RC1
Index: wikisrc/amazon_ec2/amis.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/amazon_ec2/amis.mdwn,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- wikisrc/amazon_ec2/amis.mdwn	5 Nov 2014 18:46:26 -0000	1.43
+++ wikisrc/amazon_ec2/amis.mdwn	20 Jun 2015 21:28:40 -0000	1.44
@@ -121,16 +121,16 @@
   <td>ami-f1a511ec</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 7.0_BETA_201411041110Z</th>
-  <td>ami-848a04ec</td><!-- us-east-1 -->
-  <td>ami-25e4f360</td><!-- us-west-1 -->
-  <td>ami-f586cec5</td><!-- us-west-2 -->
-  <td>ami-72cdfb6f</td><!-- eu-central-1 -->
-  <td>ami-f44fe583</td><!-- eu-west-1 -->
-  <td>ami-945271c6</td><!-- ap-southeast-1 -->
-  <td>ami-996d02a3</td><!-- ap-southeast-2 -->
-  <td>ami-61a59a60</td><!-- ap-northeast-1 -->
-  <td>ami-c301b6de</td><!-- sa-east-1 -->
+  <th>NetBSD 7.0_RC1</th>
+  <td>ami-5bde2130</td><!-- us-east-1 -->
+  <td>ami-51926515</td><!-- us-west-1 -->
+  <td>ami-1fdadf2f</td><!-- us-west-2 -->
+  <td>ami-00bf871d</td><!-- eu-central-1 -->
+  <td>ami-8dc3b9fa</td><!-- eu-west-1 -->
+  <td>ami-94dfdbc6</td><!-- ap-southeast-1 -->
+  <td>ami-efa5dfd5</td><!-- ap-southeast-2 -->
+  <td>ami-b82d89b8</td><!-- ap-northeast-1 -->
+  <td>ami-ff8b09e2</td><!-- sa-east-1 -->
 </tr>
 </table>
 
@@ -241,14 +241,15 @@
   <td>ami-07a6121a</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 7.0_BETA_201411041110Z</th>
-  <td>ami-a28d03ca</td><!-- us-east-1 -->
-  <td>ami-73e4f336</td><!-- us-west-1 -->
-  <td>ami-5587cf65</td><!-- us-west-2 -->
-  <td>ami-184ee46f</td><!-- eu-west-1 -->
-  <td>ami-24527176</td><!-- ap-southeast-1 -->
-  <td>ami-5f6d0265</td><!-- ap-southeast-2 -->
-  <td>ami-efa699ee</td><!-- ap-northeast-1 -->
-  <td>ami-3101b62c</td><!-- sa-east-1 -->
+  <th>NetBSD 7.0_RC1</th>
+  <td>ami-cbde21a0</td><!-- us-east-1 -->
+  <td>ami-61926525</td><!-- us-west-1 -->
+  <td>ami-6ddadf5d</td><!-- us-west-2 -->
+  <td>ami-3ebf8723</td><!-- eu-central-1 -->
+  <td>ami-53c0ba24</td><!-- eu-west-1 -->
+  <td>ami-aedfdbfc</td><!-- ap-southeast-1 -->
+  <td>ami-dfa5dfe5</td><!-- ap-southeast-2 -->
+  <td>ami-982e8a98</td><!-- ap-northeast-1 -->
+  <td>ami-f78b09ea</td><!-- sa-east-1 -->
 </tr>
 </table>

use templatebody to separate out the description from the template
Index: wikisrc/templates/pkg.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/pkg.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/templates/pkg.mdwn	9 Nov 2009 00:40:26 -0000	1.5
+++ wikisrc/templates/pkg.mdwn	19 Jun 2015 20:26:29 -0000	1.6
@@ -1,4 +1,6 @@
-<TMPL_IF NAME="name">[<TMPL_VAR NAME="category">/<TMPL_VAR NAME="name">](http://pkgsrc.se/<TMPL_VAR ESCAPE=URL NAME="category">/<TMPL_VAR ESCAPE=URL NAME="name">)<TMPL_ELSE>
+[[!templatebody <<ENDBODY
+[<TMPL_VAR NAME="category">/<TMPL_VAR NAME="name">](http://pkgsrc.se/<TMPL_VAR ESCAPE=URL NAME="category">/<TMPL_VAR ESCAPE=URL NAME="name">)
+ENDBODY]]
 ## Description
 
 Use this template to create a link to a [pkgsrc](http://www.pkgsrc.org)'s package. The template uses two parameters:
@@ -11,4 +13,3 @@
 Link to [[!template id=pkg category="www" name="apache"]] package page:
 
         \[[!template id=pkg category="www" name="apache"]]
-</TMPL_IF>
Index: wikisrc/templates/pr.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/pr.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/templates/pr.mdwn	10 Nov 2009 00:29:02 -0000	1.5
+++ wikisrc/templates/pr.mdwn	19 Jun 2015 20:26:29 -0000	1.6
@@ -1,4 +1,6 @@
-<TMPL_IF NAME="number">[PR #<TMPL_VAR NAME="number">](http://gnats.netbsd.org/<TMPL_VAR ESCAPE=URL NAME="number">)<TMPL_ELSE>
+[[!templatebody <<ENDBODY
+[PR #<TMPL_VAR NAME="number">](http://gnats.netbsd.org/<TMPL_VAR ESCAPE=URL NAME="number">)
+ENDBODY]]
 ## Description
 
 Use this template to create a Problem Report link. The template uses one parameter:
@@ -10,4 +12,3 @@
 Link to [[!template id=pr number=42245]]:
 
         \[[!template id=pr number=42245]]
-</TMPL_IF>

re-insert ## Description title
Index: wikisrc/templates/man.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/man.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/templates/man.mdwn	19 Jun 2015 20:18:04 -0000	1.20
+++ wikisrc/templates/man.mdwn	19 Jun 2015 20:24:11 -0000	1.21
@@ -1,6 +1,8 @@
 [[!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">)
 ENDBODY]]
+## Description
+
 Use this template to create a man page link. The template can use four parameters:
 
 * `name` - This required parameter is the name of the manpage.

adjust the ENDBODY, to hopefully reveal the description
Index: wikisrc/templates/man.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/man.mdwn,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wikisrc/templates/man.mdwn	20 May 2015 06:17:25 -0000	1.19
+++ wikisrc/templates/man.mdwn	19 Jun 2015 20:18:04 -0000	1.20
@@ -1,7 +1,6 @@
-[[!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_UNLESS name>
-## Description
-
+[[!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">)
+ENDBODY]]
 Use this template to create a man page link. The template can use four parameters:
 
 * `name` - This required parameter is the name of the manpage.
@@ -26,5 +25,3 @@
 Link to [[!template id=man name="ls" section="1" arch="i386" collection="NetBSD-5.0"]] man page, specifying section, architecture and collection:
 
         \[[!template id=man name="ls" section="1" arch="i386" collection="NetBSD-5.0"]]
-</TMPL_UNLESS>
-ENDBODY]]

replace direct links to manpages on netbsd.gw.com with templates
Index: wikisrc/guide/audio.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/audio.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/guide/audio.mdwn	21 Mar 2013 11:11:20 -0000	1.3
+++ wikisrc/guide/audio.mdwn	19 Jun 2015 19:18:27 -0000	1.4
@@ -24,7 +24,7 @@
 
 ## Supported audio cards
 
-The number of supported sound cards is ever increasing. The main source for supported audio devices are the manpages. You should have a look at the drivers listed in the *SEE ALSO* section of [audio(4)](http://netbsd.gw.com/cgi-bin/man-cgi?audio+4+NetBSD-current).
+The number of supported sound cards is ever increasing. The main source for supported audio devices are the manpages. You should have a look at the drivers listed in the *SEE ALSO* section of [[!template id=man name="audio" section="4"]].
 
 ## BIOS settings
 
@@ -97,15 +97,15 @@
 
 NetBSD comes with a number of commands that deal with audio devices. They are:
 
- * [audioctl(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audioctl+1+NetBSD-5.0.1+i386) -- is used for setting options of the audio system driver.
- * [mixerctl(1)](http://netbsd.gw.com/cgi-bin/man-cgi?mixerctl+1+NetBSD-5.0.1+i386) -- is used for controlling mixing variables, e.g., volume, balance and mute.
- * [audioplay(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audioplay+1+NetBSD-5.0.1+i386) -- is used for playing audio files.
- * [audiorecord(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audiorecord+1+NetBSD-5.0.1+i386) -- is used for recording audio files.
+ * [[!template id=man name="audioctl" section="1"]] -- is used for setting options of the audio system driver.
+ * [[!template id=man name="mixerctl" section="1"]] -- is used for controlling mixing variables, e.g., volume, balance and mute.
+ * [[!template id=man name="audioplay" section="1"]] -- is used for playing audio files.
+ * [[!template id=man name="audiorecord" section="1"]] -- is used for recording audio files.
 
 
-### [audioctl(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audioctl+1+NetBSD-5.0.1+i386)
+### [[!template id=man name="audioctl" section="1"]]
 
-[audioctl(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audioctl+1+NetBSD-5.0.1+i386) made its appearance in NetBSD 1.3 and is used to manually set some variables regarding audio I/O, like the frequencies for playing and recording. The available parameters can be displayed with the following command:
+[[!template id=man name="audioctl" section="1"]] made its appearance in NetBSD 1.3 and is used to manually set some variables regarding audio I/O, like the frequencies for playing and recording. The available parameters can be displayed with the following command:
 
     # audioctl -a | less
 
@@ -121,15 +121,15 @@
 
 This command displays the list of all the encodings supported by the audio card on your system.
 
-### [mixerctl(1)](http://netbsd.gw.com/cgi-bin/man-cgi?mixerctl+1+NetBSD-5.0.1+i386)
+### [[!template id=man name="mixerctl" section="1"]]
 
-This command is used to configure the audio mixing and has an interface similar to that of [audioctl(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audioctl+1+NetBSD-5.0.1+i386).
+This command is used to configure the audio mixing and has an interface similar to that of [[!template id=man name="audioctl" section="1"]].
 
-### [audioplay(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audioplay+1+NetBSD-5.0.1+i386)
+### [[!template id=man name="audioplay" section="1"]]
 
 With this command you can play audio files in simple formats like ULAW and WAV. For more sophisticated needs you might want to install one of the many programs available in the package system which let you play audio files in different formats (e.g. MP3, etc.)
 
-### [audiorecord(1)](http://netbsd.gw.com/cgi-bin/man-cgi?audiorecord+1+NetBSD-5.0.1+i386)
+### [[!template id=man name="audiorecord" section="1"]]
 
 Not unsurprisingly this command is used to record audio files.
 
Index: wikisrc/guide/bluetooth.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/bluetooth.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/guide/bluetooth.mdwn	21 Mar 2013 11:11:20 -0000	1.2
+++ wikisrc/guide/bluetooth.mdwn	19 Jun 2015 19:18:30 -0000	1.3
@@ -23,17 +23,17 @@
 value.
 
 Service Discovery in the Bluetooth environment is provided for by the
-[sdp(3)](http://netbsd.gw.com/cgi-bin/man-cgi?sdp+3+NetBSD-5.0.1+i386) library
+[[!template id=man name="sdp" section="3"]] library
 functions and the
-[sdpd(8)](http://netbsd.gw.com/cgi-bin/man-cgi?sdpd+8+NetBSD-5.0.1+i386) daemon,
+[[!template id=man name="sdpd" section="8"]] daemon,
 which keeps a database of locally registered services and makes the information
 available to remote devices performing queries. The
-[sdpquery(1)](http://netbsd.gw.com/cgi-bin/man-cgi?sdpquery+1+NetBSD-5.0.1+i386)
+[[!template id=man name="sdpquery" section="1"]]
 tool can be used to query local and remote service databases.
 
 Security on Bluetooth links can be enabled by encryption and authentication
 options to
-[btconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?btconfig+8+NetBSD-5.0.1+i386)
+[[!template id=man name="btconfig" section="8"]]
 which apply to all baseband links that a controller makes, or encryption and
 authentication can be enabled for individual RFCOMM and L2CAP links as required.
 When authentication is requested, a PIN is presented by each side (generally
@@ -41,11 +41,11 @@
 controller uses this PIN to generate a Link Key and reports this to the Host
 which may be asked to produce it to authenticate subsequent connections. On
 NetBSD, the
-[bthcid(8)](http://netbsd.gw.com/cgi-bin/man-cgi?bthcid+8+NetBSD-5.0.1+i386)
+[[!template id=man name="bthcid" section="8"]]
 daemon is responsible for storing link keys and responding to Link Key Requests,
 and also provides an interface to allow unprivileged users to specify a PIN with
 a PIN client, such as
-[btpin(1)](http://netbsd.gw.com/cgi-bin/man-cgi?btpin+1+NetBSD-5.0.1+i386).
+[[!template id=man name="btpin" section="1"]].
 
 ## Supported Hardware
 
@@ -55,31 +55,31 @@
 requiring an interface driver, with the following drivers available in NetBSD
 5.0:
 
- * [bcsp(4)](http://netbsd.gw.com/cgi-bin/man-cgi?bcsp+4+NetBSD-5.0.1+i386)
+ * [[!template id=man name="bcsp" section="4"]]
    provides a
-   [tty(4)](http://netbsd.gw.com/cgi-bin/man-cgi?tty+4+NetBSD-5.0.1+i386) line
+   [[!template id=man name="tty" section="4"]] line
    discipline to send and receive BlueCore Serial Protocol packets over a serial
    line as described in the *BlueCore Serial Protocol (BCSP)* specification.
- * [bt3c(4)](http://netbsd.gw.com/cgi-bin/man-cgi?bt3c+4+NetBSD-5.0.1+i386)
+ * [[!template id=man name="bt3c" section="4"]]
    provides an interface to the 3Com Bluetooth PC Card, model 3CRWB6096-A.
- * [btbc(4)](http://netbsd.gw.com/cgi-bin/man-cgi?btbc+4+NetBSD-5.0.1+i386)
+ * [[!template id=man name="btbc" section="4"]]
    provides support for the AnyCom BlueCard (LSE041, LSE039, LSE139) PCMCIA
    devices.
- * [btuart(4)](http://netbsd.gw.com/cgi-bin/man-cgi?btuart+4+NetBSD-5.0.1+i386)
+ * [[!template id=man name="btuart" section="4"]]
    provides a
-   [tty(4)](http://netbsd.gw.com/cgi-bin/man-cgi?tty+4+NetBSD-5.0.1+i386) line
+   [[!template id=man name="tty" section="4"]] line
    discipline to send and receive Bluetooth packets over a serial line as
    described in the *Bluetooth Host Controller Interface [Transport Layer]
    specification, Vol 4 part A*.
- * [sbt(4)](http://netbsd.gw.com/cgi-bin/man-cgi?sbt+4+NetBSD-5.0.1+i386)
+ * [[!template id=man name="sbt" section="4"]]
    provides support for Secure Digital IO Bluetooth adapters.
- * [ubt(4)](http://netbsd.gw.com/cgi-bin/man-cgi?ubt+4+NetBSD-5.0.1+i386)
+ * [[!template id=man name="ubt" section="4"]]
    interfaces to all USB Bluetooth controllers conforming to the *HCI USB
    Transport Layer* specification.
 
 If support for the NetBSD Bluetooth stack is enabled in the kernel,
 autoconfiguration messages will show up in the
-[dmesg(8)](http://netbsd.gw.com/cgi-bin/man-cgi/man?dmesg+8+NetBSD-current)
+[[!template id=man name="dmesg" section="8"]]
 output, for example:
 
     bt3c0 at pcmcia0 function 0: <3COM, 3CRWB60-A, Bluetooth PC Card>
@@ -135,7 +135,7 @@
 Some older USB Bluetooth dongles based on the Broadcom BCM2033 chip require
 firmware to be loaded before they can function, and these devices will be
 attached to
-[ugen(4)](http://netbsd.gw.com/cgi-bin/man-cgi?ugen+4+NetBSD-5.0.1+i386). Use
+[[!template id=man name="ugen" section="4"]]. Use
 the `sysutils/bcmfw` package from the NetBSD Package Collection, to load
 firmware and enable these.
 
@@ -151,12 +151,12 @@
     # /etc/rc.d/bluetooth start
 
 *Note*: Configuration of Bluetooth controllers is done with the
-[btconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?btconfig+8+NetBSD-5.0.1+i386)
+[[!template id=man name="btconfig" section="8"]]
 program, and the above argument enables only basic functionality, see the manual
 page for other useful options.
 
 **Important**:
-[bthcid(8)](http://netbsd.gw.com/cgi-bin/man-cgi?bthcid+8+NetBSD-5.0.1+i386)
+[[!template id=man name="bthcid" section="8"]]
 *must* be running in order to make authenticated connections with remote
 devices, and authentication may be requested by either device.
 
@@ -164,17 +164,17 @@
 
 Support for *Human Interface Devices (HIDs)*, which operate using the USB HID
 protocol over a pair of L2CAP channels is provided by the
-[bthidev(4)](http://netbsd.gw.com/cgi-bin/man-cgi?bthidev+4+NetBSD-5.0.1+i386)
+[[!template id=man name="bthidev" section="4"]]
 driver. Currently, keyboards and mice are catered for, and attach to
-[wscons(4)](http://netbsd.gw.com/cgi-bin/man-cgi?wscons+4+NetBSD-5.0.1+i386) as
+[[!template id=man name="wscons" section="4"]] as
 normal.
 
 ### Mice
 
 Bluetooth Mice can be attached to the system with the
-[btms(4)](http://netbsd.gw.com/cgi-bin/man-cgi?btms+4+NetBSD-5.0.1+i386) driver,
+[[!template id=man name="btms" section="4"]] driver,
 using
-[btdevctl(8)](http://netbsd.gw.com/cgi-bin/man-cgi?btdevctl+8+NetBSD-5.0.1+i386).
+[[!template id=man name="btdevctl" section="8"]].
 
 First, you must discover the BDADDR of the device. This may be printed on the
 box, but the easiest way is to place the device into discoverable mode and
@@ -198,7 +198,7 @@
 Now, you can query the mouse, which will likely request authentication before it
 accepts connections. The fixed PIN should be listed in the documentation, though
 `0000` is often used. Set the PIN first using the
-[btpin(1)](http://netbsd.gw.com/cgi-bin/man-cgi?btpin+1+NetBSD-5.0.1+i386)
+[[!template id=man name="btpin" section="1"]]
 program:
 
     # btpin -d ubt0 -a mouse -p 0000
@@ -242,10 +242,10 @@

(Diff truncated)
remove extraneous parentheses
Index: wikisrc/guide/net-practice.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/guide/net-practice.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/guide/net-practice.mdwn	21 Mar 2013 11:11:21 -0000	1.3
+++ wikisrc/guide/net-practice.mdwn	19 Jun 2015 18:13:41 -0000	1.4
@@ -915,7 +915,7 @@
 running kernel. Support is included in the GENERIC kernel.
 
 When the system is ready the bridge can be created, this can be done using the 
-[brconfig(8)]((http://netbsd.gw.com/cgi-bin/man-cgi?brconfig+8+NetBSD-current))
+[brconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?brconfig+8+NetBSD-current)
 command. First of a bridge interface has to be created. With the following 
 `ifconfig` command the `bridge0` interface will be created:
 

This is stale information from the old community blog. It was updated
and integrated into The NetBSD Guide previously, the chapter is available
in this wiki as guide/bluetooth.mdwn
--- wikisrc/bluetooth.mdwn	2015-06-19 17:05:09.000000000 +0000
+++ /dev/null	2015-06-19 17:00:00.000000000 +0000
@@ -1,469 +0,0 @@
-Bluetooth is available since version 4 of NetBSD.
-
-**Contents**
-
-[[!toc]]
-
-
-# Background
-
-Bluetooth is a digital radio protocol used for short range and low
-power communications. NetBSD 4.0 introduced support for the Bluetooth
-protocol stack, and some integration of device profiles into the
-NetBSD device framework.
-
-The lower layers of the Bluetooth protocol stack pertaining to
-actual radio links between devices are handled inside the Bluetooth
-Controller, which communicates with the Host computer using the
-Host Controller Interface (HCI) protocol which can be accessed via
-a raw packet BTPROTO_HCI socket interface.
-
-The lowest useable protocol is the Link Layer Control and Adaptation
-Protocol (L2CAP), which can be accessed via a BTPROTO_L2CAP socket
-interface. This provides sequential packet access to remote devices,
-with up to 64k channels per radio link. When an L2CAP channel is
-opened, the protocol or service that is required is identified by
-a Protocol/Service Multiplexer (PSM) value.
-
-One available protocol is RFCOMM, which provides up to 30 emulated
-serial connections multiplexed over a single L2CAP channel. This
-streamed data protocol can be accessed using the BTPROTO_RFCOMM
-socket interface though it is planned to also provide a direct tty
-interface later. Typically, many services use RFCOMM links to provide
-a control interface using the AT command set.
-
-Isochronous (SCO) Audio connections may be created on a baseband
-radio link using either the BTPROTO_SCO socket interface, or the
-[btsco(4)](http://netbsd.gw.com/cgi-bin/man-cgi?btsco+4+NetBSD-current)
-audio device driver. While the specification says that up to three
-such links can be made between devices, the current Bluetooth code
-can only handle one with any dignity.
-
-Support for Human Interface Devices, which operate using the USB
-HID protocol over a pair of L2CAP channels is provided by the
-[bthidev(4)](http://netbsd.gw.com/cgi-bin/man-cgi?bthidev+4+NetBSD-current)
-driver. Currently, keyboards and mice are catered for, and attach to
-[wscons(4)](http://netbsd.gw.com/cgi-bin/man-cgi?wscons+4+NetBSD-current)
-as normal.
-
-Service Discovery in the Bluetooth environment is made available
-by
-[libsdp(3)](http://netbsd.gw.com/cgi-bin/man-cgi?libsdp+3+NetBSD-current)
-and the
-[sdpd(8)](http://netbsd.gw.com/cgi-bin/man-cgi?sdpd+8+NetBSD-current)
-daemon (both ported from FreeBSD), which allows programs to register
-services and makes the information available to remote devices
-performing queries. Limited querying can be done with the
-[sdpquery(1)](http://netbsd.gw.com/cgi-bin/man-cgi?sdpquery+1+NetBSD-current)
-program.
-
-Security on Bluetooth links is supplied by encryption and authentication
-options. In NetBSD-4.0, these can only be applied to all baseband
-links that a controller makes, by
-[btconfig(8)](http://netbsd.gw.com/cgi-bin/man-cgi?btconfig+8+NetBSD-current).
-For NetBSD-current versions after 21 April 2007, L2CAP and RFCOMM
-connections may additionally specify a minimum link mode for the
-baseband link which is applied during connection establishment.
-When authentication is requested, a PIN is presented by each side,
-generally entered by the operator (some limited input devices have
-a fixed PIN). The controller uses this PIN to generate a Link Key
-and reports this to the host computer and will ask for it to
-authenticate subsequent connections. On NetBSD, the
-[bthcid(8)](http://netbsd.gw.com/cgi-bin/man-cgi?bthcid+8+NetBSD-current)
-daemon is responsible for storing these and responding to Link Key
-requests, and also provides an interface to allow users to specify
-a PIN with a PIN client, such as
-[btpin(1)](http://netbsd.gw.com/cgi-bin/man-cgi?btpin+1+NetBSD-current) or
-[sysutils/btpin-qt](http://pkgsrc.se/sysutils/btpin-qt).
-
-
-# Requirements
-
-The relevant device declarations are included in the GENERIC kernel
-configurations for the following architectures:
-
-* alpha
-* amd64
-* i386
-* sparc64
-
-For other architectures, you will need to add the device declarations
-to your kernel config file. Bluetooth should work on any architecture
-that has USB and/or PCMCIA available.
-
-Please notice that you will need NetBSD 4.0 or higher to use
-bluetooth. Since 4.0 is tagged BETA as of August 31, you will need
-a fairly current kernel. To build a current kernel, please read
-[[How to build NetBSD-current]].
-
-If you are looking to purchase a Bluetooth controller for use with
-NetBSD, the better devices are USB based, and a v2.0 device is
-better than v1.2. The Class of the device indicates the power of
-the radio - Class 1 is 100m and Class 2 is 10m.
-
-
-# Hardware
-
-If Bluetooth is configured in your kernel, you should see Bluetooth
-controllers showing up in your boot messages, for example:
-
-    bt3c0 at pcmcia0 function 0: <3COM, 3CRWB60-A, Bluetooth PC Card>
-    ubt0 at uhub1 port 4 configuration 1 interface 0
-    ubt0: Cambridge Silicon Radio Bluetooth USB Adapter, rev 2.00/19.58, addr 4
-    ubt1 at uhub1 port 2 configuration 1 interface 0
-    ubt1: Broadcom Belkin Bluetooth Device, rev 1.10/0.01, addr 5
-
-Some PCMCIA and Cardbus devices will attach as serial devices, and
-they need to be configured to use the
-[btuart(4)](http://netbsd.gw.com/cgi-bin/man-cgi?btuart+4+NetBSD-current)
-line discipline to interface to the Bluetooth protocol stack.
-
-
-# Userland configuration
-
-Please edit your
-[rc.conf(5)](http://netbsd.gw.com/cgi-bin/man-cgi?rc.conf+5+NetBSD-current)
-file and ensure it contains:
-
-    # configure bluetooth controllers
-    btconfig=YES
-    btconfig_args="up pscan switch class 0x02010c"
-    
-    # configure bluetooth devices
-    btdevctl=YES
-    
-    # start bluetooth key daemon
-    bthcid=YES
-    
-    # start service discovery daemon
-    sdpd=YES
-
-> i had to add 'auth' to the `btconfig_args` line to get my phone
-> to pair. --[[Jasper]] 22:50, 15 September 2006 (CEST)
-
-> sdpd runs as (user:group) _sdpd:_sdpd, but these are not present
-> in 4.0 -- PR
-> [bin/37125](http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=37125)
-> --[[Shattered]] 14:53, 10 April 2008 (CEST)
-
-which should be ok. Reboot or enter:
-
-    /etc/rc.d/btconfig start
-    /etc/rc.d/bthcid start
-    /etc/rc.d/sdpd start
-
-and you should be able to see that your device is configured, e.g:
-
-    % btconfig -vvvv ubt0
-        ubt0: bdaddr 00:08:1b:8d:ba:6d flags 0x3<UP,RUNNING>
-        num_cmd = 1
-        num_acl = 8, acl_mtu = 384
-        num_sco = 8, sco_mtu = 64
-        class: [0x02010c] Laptop Computer <Networking>
-        name: "CSR - bc4"
-        voice: [0x0060]
-        Input Coding: Linear PCM [16-bit, pos 0], 2's complement
-        Air Coding: CVSD
-        pin: variable
-        options: -iscan pscan -auth -encrypt switch -hold sniff -park
-        ptype: [0xcc18] DM1 DH1 DM3 DH3 DM5 DH5 2-DH1 3-DH1 2-DH3 3-DH3 2-DH5 3-DH5
-        page timeout: 5120 ms
-        features: <3 slot> <5 slot> <encryption> <slot offset> <timing accuracy>
-        <role switch> <hold mode> <sniff mode> <park mode> <RSSI> <channel quality>
-        <SCO link> <HV2> <HV3> <mu-Law log> <A-Law log> <CVSD data> <paging parameter>
-        <power control> <transparent SCO> <broadcast encryption> <EDR ACL 2Mbps>
-        <EDR ACL 3Mbps> <enhanced inquiry scan> <interlaced inquiry scan>
-        <interlaced page scan> <RSSI with inquiry result> <EV3 packets>
-        <EV4 packets> <EV5 packets> <AFH capable slave> <AFH class slave>
-        <3 slot EDR ACL> <5 slot EDR ACL> <AFH capable master> <AFH class master>
-        <EDR eSCO 2Mbps> <EDR eSCO 3Mbps> <3 slot EDR eSCO> <extended features>
-
-
-# HID configuration
-
-**Very important**:
-[bthcid(8)](http://netbsd.gw.com/cgi-bin/man-cgi?bthcid+8+NetBSD-current)
-must be running.
-
-**Important**: [sysutils/hcidump](http://pkgsrc.se/sysutils/hcidump)
-is very useful.
-
-Place device into discoverable mode, and peform an inquiry: 
-
-    % btconfig ubt0 inquiry
-    Device Discovery from device: ubt0 .... 1 response
-      1: bdaddr 00:0a:95:10:8d:8c (unknown)
-       : name "Apple Wireless Mouse"
-       : class [0x002580] Peripheral Mouse <Limited Discoverable>

(Diff truncated)
Index: wikisrc/ports/evbarm/allwinner.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/allwinner.mdwn,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- wikisrc/ports/evbarm/allwinner.mdwn	2 Apr 2015 18:36:59 -0000	1.50
+++ wikisrc/ports/evbarm/allwinner.mdwn	11 Jun 2015 08:56:10 -0000	1.51
@@ -71,7 +71,7 @@
 
 ## A10 / A20 / A31 based boards
 
-* Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *beagleboard.img*
+* Start with an ARMv7 image from *evbarm-earmv7hf/binary/gzimg/* such as *beagleboard.img* from netbsd-7, or *armv7.img* from HEAD
 * Download a U-Boot build for your board
   * Download the correct build from the linux-sunxi web site <http://dl.linux-sunxi.org/nightly/u-boot-sunxi/u-boot-sunxi-mainline/u-boot-sunxi-mainline-latest/>.
 * Write the *u-boot-sunxi-with-spl.bin* loader to the empty space at the start of the base image:

SMP seems OK now
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/ports/evbarm/tegra.mdwn	30 May 2015 15:47:08 -0000	1.14
+++ wikisrc/ports/evbarm/tegra.mdwn	6 Jun 2015 15:27:53 -0000	1.15
@@ -33,7 +33,6 @@
    - Power button
 
 # TODO
- - SMP stability
  - eMMC support
  - SD/MMC UHS-I support (needs [[!template id=man name="sdmmc" section="4"]] changes)
  - Framebuffer console

Random number generator is supported now
Index: wikisrc/ports/evbarm/beaglebone.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/beaglebone.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/ports/evbarm/beaglebone.mdwn	25 Apr 2015 14:53:19 -0000	1.11
+++ wikisrc/ports/evbarm/beaglebone.mdwn	6 Jun 2015 15:19:34 -0000	1.12
@@ -14,6 +14,7 @@
  - USB (host)
  - I²C
  - CPU frequency scaling (various speeds between 300MHz and 1GHz)
+ - Random number generator [[!template id=man name="trng" section="4"]]
 
 # What needs work
  - SPI

Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/ports/evbarm/tegra.mdwn	30 May 2015 14:47:45 -0000	1.13
+++ wikisrc/ports/evbarm/tegra.mdwn	30 May 2015 15:47:08 -0000	1.14
@@ -29,6 +29,8 @@
    - On-board Realtek 8111G [[!template id=man name="re" section="4"]] gigabit ethernet 
    - EEPROM [[!template id=man name="seeprom" section="4"]] (on I2C)
    - TMP451 [[!template id=man name="titemp" section="4"]] temperature sensor (on I2C)
+   - RF kill switch
+   - Power button
 
 # TODO
  - SMP stability

hdaudio(4) attaches now, but still depends on HDMI support
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/ports/evbarm/tegra.mdwn	30 May 2015 13:27:25 -0000	1.12
+++ wikisrc/ports/evbarm/tegra.mdwn	30 May 2015 14:47:45 -0000	1.13
@@ -24,6 +24,7 @@
  - USB 2.0 [[!template id=man name="ehci" section="4"]] controller
  - PCI express
  - SATA [[!template id=man name="ahcisata" section="4"]] controller
+ - [[!template id=man name="hdaudio" section="4"]] (needs HDMI)
  - Jetson TK1
    - On-board Realtek 8111G [[!template id=man name="re" section="4"]] gigabit ethernet 
    - EEPROM [[!template id=man name="seeprom" section="4"]] (on I2C)
@@ -35,7 +36,6 @@
  - SD/MMC UHS-I support (needs [[!template id=man name="sdmmc" section="4"]] changes)
  - Framebuffer console
  - HDMI
- - [[!template id=man name="hdaudio" section="4"]] (for HDMI audio)
  - I2S
  - Audio codec
  - AS3722 power management unit

Watchdog timer is supported now
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/ports/evbarm/tegra.mdwn	28 May 2015 12:18:54 -0000	1.11
+++ wikisrc/ports/evbarm/tegra.mdwn	30 May 2015 13:27:25 -0000	1.12
@@ -19,6 +19,7 @@
  - I2C controller
  - UART [[!template id=man name="com" section="4"]] serial console
  - RTC
+ - Watchdog timer
  - SDMMC [[!template id=man name="sdhc" section="4"]] controller
  - USB 2.0 [[!template id=man name="ehci" section="4"]] controller
  - PCI express
@@ -38,7 +39,6 @@
  - I2S
  - Audio codec
  - AS3722 power management unit
- - Watchdog timer
  - GPU (nouveau)
 
 # Generating a boot script

Set ALL_KERNELS, not KERNEL_SETS, to limit the kernels built.
Index: wikisrc/tutorials/how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/tutorials/how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn	20 Nov 2011 20:55:21 -0000	1.1
+++ wikisrc/tutorials/how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn	28 May 2015 21:08:14 -0000	1.2
@@ -54,7 +54,7 @@
 
     $ cd ~/net/src
     $ ./build.sh -u -U -m evbarm -a armeb build
-    $ ./build.sh -u -U -m evbarm -a armeb -V KERNEL_SETS=NSLU2_ALL release
+    $ ./build.sh -u -U -m evbarm -a armeb -V ALL_KERNELS=NSLU2_ALL release
 
 When finished, you'll find all of the necessary files in ~/net/src/obj/releasedir/evbarm/binary/sets.
 <pre><code>
@@ -132,7 +132,7 @@
 
     $ sudo nano hosts
 <pre><code>
-#	$NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.1 2011/11/20 20:55:21 mspo Exp $
+#	$NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.2 2015/05/28 21:08:14 riastradh Exp $
 #
 # Host Database
 # This file should contain the addresses and aliases
@@ -184,7 +184,7 @@
 <pre><code>
 $ sudo nano rc.conf
 
-#	$NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.1 2011/11/20 20:55:21 mspo Exp $
+#	$NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.2 2015/05/28 21:08:14 riastradh Exp $
 #
 # see rc.conf(5) for more information.
 #
@@ -215,7 +215,7 @@
 <pre><code>
 $ sudo nano ttys
 
-#	$NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.1 2011/11/20 20:55:21 mspo Exp $
+#	$NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.2 2015/05/28 21:08:14 riastradh Exp $
 #
 #	from: @(#)ttys	5.1 (Berkeley) 4/17/89
 #
@@ -543,7 +543,7 @@
 
 Slug's rc.conf:
 <pre><code>
-#       $NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.1 2011/11/20 20:55:21 mspo Exp $
+#       $NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.2 2015/05/28 21:08:14 riastradh Exp $
 #
 # see rc.conf(5) for more information.
 #
@@ -570,7 +570,7 @@
 </code></pre>
 Slug's ssh/sshd_config:
 <pre><code>
-#       $NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.1 2011/11/20 20:55:21 mspo Exp $
+#       $NetBSD: how_to_install_netbsd_on_the_linksys_nslu2___40__slug__41___without_a_serial_port__44___using_nfs_and_telnet.mdwn,v 1.2 2015/05/28 21:08:14 riastradh Exp $
 #       $OpenBSD: sshd_config,v 1.75 2007/03/19 01:01:29 djm Exp $
 
 # This is the sshd server system-wide configuration file.  See

add GPU to todo list
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/ports/evbarm/tegra.mdwn	24 May 2015 22:31:17 -0000	1.10
+++ wikisrc/ports/evbarm/tegra.mdwn	28 May 2015 12:18:54 -0000	1.11
@@ -39,6 +39,7 @@
  - Audio codec
  - AS3722 power management unit
  - Watchdog timer
+ - GPU (nouveau)
 
 # Generating a boot script
 

move this file inside mspo/
--- wikisrc/users/porting_and_updating_ghc.mdwn	2015-05-27 13:57:44.000000000 +0000
+++ /dev/null	2015-05-27 13:50:01.000000000 +0000
@@ -1,30 +0,0 @@
-https://downloads.haskell.org/~ghc/6.4.2/docs/html/building/sec-porting-ghc.html#sec-booting-from-hc
-
-> < mspo> Bootstrapping GHC on a system without GHC already installed is achieved by taking the intermediate C files (known as HC  
->              files) from another GHC compilation, compiling them using gcc to get a working GHC.  
-> < dh> that is no longer supported.  
-> < dh> or rather, that's what's no longer supported  
-> < mspo> that is "kristerw's gcc 6.4.2 bootstrap kit"  
-
-> < mspo> dh: what about building with a first-party ghc under linux emulation?  
-> < mspo> https://downloads.haskell.org/~ghc/7.8.3/  
-> < dh> I dunno  
-
-> < dh> mspo: for ghc, to begin with, install lang/ghc (ghc 6.8) and try packaging 6.12  
-> < dh> you need an i386 chroot for this, and it's a large slow build, but it's otherwise mostly ok  
-> < dh> if you set it up so it'll build from an already-installed ghc 6.8, that's a good starting point  
-> < dh> I have some stuff I can send you regarding how to rig it out for using a binary package as a bootstrap kit  
-> < dh> meanwhile, I need to commit a gcc64 package (the ghc from the existing "source" bootstrap kit)  
-> < dh> and a ghc68 package that's equivalent to the current lang/ghc but uses ghc64  
-> < dh> both of these I have most of the work already done  
-> < dh> then ideally we hack things so they can all be installed at once, debug ghc612, and then work on the most recent 7.x that  
-            still builds on 6.12  
-> < dh> packaging all the versions means binary bootstrap kits become less critical because anyone can make one  
-> < dh> also, in the above s/gcc/ghc/g, fingers have "gcc" wired in  
-> < dh> the idea is to have each ghc package support building either from a binary package of an older version, a binary package   
-            of itself, an installed older version, or an installed itself  
-> < mspo> dh: got it (I think)  
-> < mspo> dh: I'm a littls scared about trying to make the jump to 64bit  
-> < dh> and at some point we want to figure out ... that  
-> < dh> but let's make i386-netbsd work first  
-> < dh> using a 32-bit chroot for haskell is annoying but it's not critical  
--- /dev/null	2015-05-27 13:50:01.000000000 +0000
+++ wikisrc/users/mspo/porting_and_updating_ghc.mdwn	2015-05-27 13:57:44.000000000 +0000
@@ -0,0 +1,30 @@
+https://downloads.haskell.org/~ghc/6.4.2/docs/html/building/sec-porting-ghc.html#sec-booting-from-hc
+
+> < mspo> Bootstrapping GHC on a system without GHC already installed is achieved by taking the intermediate C files (known as HC  
+>              files) from another GHC compilation, compiling them using gcc to get a working GHC.  
+> < dh> that is no longer supported.  
+> < dh> or rather, that's what's no longer supported  
+> < mspo> that is "kristerw's gcc 6.4.2 bootstrap kit"  
+
+> < mspo> dh: what about building with a first-party ghc under linux emulation?  
+> < mspo> https://downloads.haskell.org/~ghc/7.8.3/  
+> < dh> I dunno  
+
+> < dh> mspo: for ghc, to begin with, install lang/ghc (ghc 6.8) and try packaging 6.12  
+> < dh> you need an i386 chroot for this, and it's a large slow build, but it's otherwise mostly ok  
+> < dh> if you set it up so it'll build from an already-installed ghc 6.8, that's a good starting point  
+> < dh> I have some stuff I can send you regarding how to rig it out for using a binary package as a bootstrap kit  
+> < dh> meanwhile, I need to commit a gcc64 package (the ghc from the existing "source" bootstrap kit)  
+> < dh> and a ghc68 package that's equivalent to the current lang/ghc but uses ghc64  
+> < dh> both of these I have most of the work already done  
+> < dh> then ideally we hack things so they can all be installed at once, debug ghc612, and then work on the most recent 7.x that  
+            still builds on 6.12  
+> < dh> packaging all the versions means binary bootstrap kits become less critical because anyone can make one  
+> < dh> also, in the above s/gcc/ghc/g, fingers have "gcc" wired in  
+> < dh> the idea is to have each ghc package support building either from a binary package of an older version, a binary package   
+            of itself, an installed older version, or an installed itself  
+> < mspo> dh: got it (I think)  
+> < mspo> dh: I'm a littls scared about trying to make the jump to 64bit  
+> < dh> and at some point we want to figure out ... that  
+> < dh> but let's make i386-netbsd work first  
+> < dh> using a 32-bit chroot for haskell is annoying but it's not critical  

--- /dev/null	2015-05-27 03:50:00.000000000 +0000
+++ wikisrc/users/porting_and_updating_ghc.mdwn	2015-05-27 03:57:15.000000000 +0000
@@ -0,0 +1,30 @@
+https://downloads.haskell.org/~ghc/6.4.2/docs/html/building/sec-porting-ghc.html#sec-booting-from-hc
+
+> < mspo> Bootstrapping GHC on a system without GHC already installed is achieved by taking the intermediate C files (known as HC  
+>              files) from another GHC compilation, compiling them using gcc to get a working GHC.  
+> < dh> that is no longer supported.  
+> < dh> or rather, that's what's no longer supported  
+> < mspo> that is "kristerw's gcc 6.4.2 bootstrap kit"  
+
+> < mspo> dh: what about building with a first-party ghc under linux emulation?  
+> < mspo> https://downloads.haskell.org/~ghc/7.8.3/  
+> < dh> I dunno  
+
+> < dh> mspo: for ghc, to begin with, install lang/ghc (ghc 6.8) and try packaging 6.12  
+> < dh> you need an i386 chroot for this, and it's a large slow build, but it's otherwise mostly ok  
+> < dh> if you set it up so it'll build from an already-installed ghc 6.8, that's a good starting point  
+> < dh> I have some stuff I can send you regarding how to rig it out for using a binary package as a bootstrap kit  
+> < dh> meanwhile, I need to commit a gcc64 package (the ghc from the existing "source" bootstrap kit)  
+> < dh> and a ghc68 package that's equivalent to the current lang/ghc but uses ghc64  
+> < dh> both of these I have most of the work already done  
+> < dh> then ideally we hack things so they can all be installed at once, debug ghc612, and then work on the most recent 7.x that  
+            still builds on 6.12  
+> < dh> packaging all the versions means binary bootstrap kits become less critical because anyone can make one  
+> < dh> also, in the above s/gcc/ghc/g, fingers have "gcc" wired in  
+> < dh> the idea is to have each ghc package support building either from a binary package of an older version, a binary package   
+            of itself, an installed older version, or an installed itself  
+> < mspo> dh: got it (I think)  
+> < mspo> dh: I'm a littls scared about trying to make the jump to 64bit  
+> < dh> and at some point we want to figure out ... that  
+> < dh> but let's make i386-netbsd work first  
+> < dh> using a 32-bit chroot for haskell is annoying but it's not critical  

Index: wikisrc/users/mspo.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/mspo.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/users/mspo.mdwn	30 Nov 2013 16:34:43 -0000	1.8
+++ wikisrc/users/mspo.mdwn	27 May 2015 03:46:01 -0000	1.9
@@ -3,3 +3,5 @@
 [[projects test]]
 
 [[myproj]]
+
+[[porting and updating ghc]]

SATA works now
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/ports/evbarm/tegra.mdwn	18 May 2015 12:08:24 -0000	1.9
+++ wikisrc/ports/evbarm/tegra.mdwn	24 May 2015 22:31:17 -0000	1.10
@@ -22,6 +22,7 @@
  - SDMMC [[!template id=man name="sdhc" section="4"]] controller
  - USB 2.0 [[!template id=man name="ehci" section="4"]] controller
  - PCI express
+ - SATA [[!template id=man name="ahcisata" section="4"]] controller
  - Jetson TK1
    - On-board Realtek 8111G [[!template id=man name="re" section="4"]] gigabit ethernet 
    - EEPROM [[!template id=man name="seeprom" section="4"]] (on I2C)
@@ -37,7 +38,6 @@
  - I2S
  - Audio codec
  - AS3722 power management unit
- - [[!template id=man name="ahcisata" section="4"]] (for SATA support)
  - Watchdog timer
 
 # Generating a boot script

prune some stale sentences, man-link-ify some drivers.
Index: wikisrc/ports/sun3.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sun3.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/sun3.mdwn	6 Oct 2014 21:41:29 -0000	1.7
+++ wikisrc/ports/sun3.mdwn	22 May 2015 06:52:02 -0000	1.8
@@ -7,7 +7,7 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/sun3/110.gif"
 about="""
-NetBSD/sun3 is the port of NetBSD to the [Sun Microsystems](http://www.sun.com/)
+NetBSD/sun3 is the port of NetBSD to the Sun Microsystems
 **sun3**, and **sun3x** series of computers, which are based on the Motorola
 [68020](http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MC68020)
 and [68030](http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=MC68030)
@@ -15,63 +15,45 @@
 Sun sold these computers as both servers and desktop workstations from
 the mid to late 1980's. They were superseded by the **sun4** SPARC RISC systems,
 which are supported by NetBSD as [[NetBSD/sparc|sparc]].
-
-Nathan Williams and Jeremy Cooper are the maintainers of NetBSD/sun3. 
 """
 supported_hardware="""
 ###Supported System Models
 
-See [[Supported System Models|sun3_supported_system_models]] page.
-
-### Disk and RAM Requirements
-
-* Minimum
-    * 4MB RAM, ~80MB disk
-* Normal
-    * 8MB RAM, 200MB disk
-* Normal + X11
-    * 16MB RAM, 300MB disk
-
-The complete NetBSD sources without objects require 200MB of disk.
-
-To run the X Window System or compile the NetBSD system sources
-(i.e. development), more RAM and disk are recommended.
-Good performance requires 8MB of RAM, or 16MB of RAM
-when running the X Window System.
+See the [[Supported System Models|sun3_supported_system_models]] page.
 
 ### Supported Hardware
 
 The following Sun3 devices are currently supported:
 
 * RS-232c Serial ports:
-  * built-in z8530 SCC as ttya, ttyb (*zs*)
+  * built-in z8530 SCC as ttya, ttyb ([[!template id=man name="zs" section="4"]])
 * Sun Video adapters:
-  * 1 bpp framebuffer, (*bwtwo*)
-  * 8 bpp framebuffer (*cgtwo*)
-  * 8 bpp (+overlay) framebuffer (*cgfour*)
+  * 1 bpp framebuffer, ([[!template id=man name="bwtwo" section="4" arch="sun3"]])
+  * 8 bpp framebuffer ([[!template id=man name="cgtwo" section="4" arch="sun3"]])
+  * 8 bpp (+overlay) framebuffer ([[!template id=man name="cgfour" section="4" arch="sun3"]])
 * Network interfaces:
-  * On-board AMD LANCE Ethernet (*le*)
-  * On-board Intel Ethernet (*ie*)
-  * VME Intel Ethernet board (*ie*)
+  * On-board AMD LANCE Ethernet ([[!template id=man name="le" section="4"]])
+  * On-board Intel Ethernet ([[!template id=man name="ie" section="4" arch="sun3"]])
+  * VME Intel Ethernet board ([[!template id=man name="ie" section="4" arch="sun3"]])
 * SCSI bus host adapters:
-  * On-board NCR 5380 SCSI Bus Controller (*si*)
-  * On-board Emulex SCSI controller on sun3x (*esp*)
-  * Sun-3 VME SCSI (also NCR 5380 SBC, Sun part # 501-1236) (*si*)
+  * On-board NCR 5380 SCSI Bus Controller ([[!template id=man name="si" section="4"]])
+  * On-board Emulex SCSI controller on sun3x ([[!template id=man name="esp" section="4"]])
+  * Sun-3 VME SCSI (also NCR 5380 SBC, Sun part # 501-1236) ([[!template id=man name="si" section="4"]])
 * SMD Disks: (the big, heavy ones)
-  * Xylogics 450/451 (*xy*)
-  * Xylogics 753/7053 (*xd*)
+  * Xylogics 450/451 ([[!template id=man name="xy" section="4" arch="sparc"]])
+  * Xylogics 753/7053 ([[!template id=man name="xd" section="4" arch="sparc"]])
 * Floppy drive:
   * Sun 3/80 built-in floppy drive (*fdc*)
 * Input devices:
-  * Sun keyboard (*kbd*) and mouse (*ms*)
+  * Sun keyboard ([[!template id=man name="kbd" section="4" arch="sun3"]]) and mouse ([[!template id=man name="ms" section="4" arch="sun3"]])
 * Miscellaneous:
-  * Battery-backed real-time clock.
+  * Battery-backed real-time clock
 
 If you have a device that's not listed, it might be compatible with
 something else, or we might have simply forgotten it.
 If all else fails, maybe you could write a driver!
 
-Note: The Sun VME *sc* SCSI card is not yet supported. 
+Note: The Sun VME [[!template id=man name="sc" section="4"]] SCSI card is not supported. 
 """
 additional="""
 ### Features of NetBSD/sun3

link to sun3 page, man-link-ify, minor wording tweak
Index: wikisrc/ports/sun2.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sun2.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/sun2.mdwn	6 Oct 2014 21:41:29 -0000	1.7
+++ wikisrc/ports/sun2.mdwn	22 May 2015 06:25:05 -0000	1.8
@@ -10,12 +10,12 @@
 computers, which are based on the Motorola 68010 CPU with a Sun-designed
 custom MMU. Sun sold these computers as both servers and desktop workstations
 from the early to mid 1980's. They were superseded by the sun3 systems,
-which are supported by NetBSD as NetBSD/sun3.
+which are supported by NetBSD as [NetBSD/sun3](../sun3/).
 """
 supported_hardware="""
 ###Supported System Models
 
-The initial snapshots of NetBSD/sun2 support the following systems:
+The following systems are supported:
 
 * Sun2 Multibus machines:
   * Sun 2/120
@@ -26,10 +26,10 @@
 
 NetBSD/sun2 currently supports the following hardware:
 
-* 1 bpp framebuffer, Multibus card (*bwtwo*)
-* 10 Mbps Intel 82586 ethernet, Multibus card (*ie*)
-* 10 Mbps 3Com 3c400 ethernet, Multibus card (*ec*)
-* 5 MB/s Sun-2 SCSI controller, Multibus card (Interrupt driven and polled DMA) (*sc*)
+* 1 bpp framebuffer, Multibus card ([[!template id=man name="bwtwo" section="4" arch="sun2"]])
+* 10 Mbps Intel 82586 ethernet, Multibus card ([[!template id=man name="ie" section="4" arch="sun2"]])
+* 10 Mbps 3Com 3c400 ethernet, Multibus card ([[!template id=man name="ec" section="4" arch="sun2"]])
+* 5 MB/s Sun-2 SCSI controller, Multibus card (Interrupt driven and polled DMA) ([[!template id=man name="sc" section="4"]])
 * All on-board and optional serial ports
 * Most input devices (keyboards, mice, trackballs)
 

remove comment that has been addressed.
--- wikisrc/ports/sparc64/comment_1_8e627205f2a9e9ad382fb255a1ae9113._comment	2015-05-22 06:12:07.000000000 +0000
+++ /dev/null	2015-05-22 06:10:02.000000000 +0000
@@ -1,22 +0,0 @@
-[[!comment format=mdwn
- username="https://me.yahoo.com/a/IZ9XO3Ax1NDlkznVSToDf1sLgfiB1eOm#332d2"
- nickname="Gareth"
- subject="Links need the hostname corrected."
- date="2014-12-24T10:08:18Z"
- content="""
-Some of the links in the \"Additional Info\" section refer to wiki.netbsd.org, whereas they should refer to www.netbsd.org.
-
-For example:
-/ports/sparc64/faq.html
-is a broken link.
-
-But changing wiki to www works:
-http://www.netbsd.org/ports/sparc64/faq.html
-
-
-Links I've noticed that need correcting include:
-NetBSD/sparc64 FAQ
-Notes on System Models
-NetBSD/sparc64 History
-
-"""]]

tweak wording and remove "new in 2.0" notes
Index: wikisrc/ports/sparc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/ports/sparc.mdwn	6 Oct 2014 21:41:29 -0000	1.8
+++ wikisrc/ports/sparc.mdwn	22 May 2015 06:06:02 -0000	1.9
@@ -13,7 +13,7 @@
 distribution from the University of California, Berkeley.  It was
 imported into the NetBSD source tree on October 2, 1993.  Special
 thanks are extended to the LBL Computer Systems Engineering group
-for their work.  Without which, this port would not exist.
+for their work.  Without their work, this port would not exist.
 
 For frequently asked questions and links to Sun hardware
 information, see the [NetBSD/sparc FAQ](http://www.NetBSD.org/ports/sparc/faq.html).
@@ -22,11 +22,8 @@
 [[NetBSD/sparc64|sparc64]]
 """
 supported_hardware="""
-Systems for which support was added in NetBSD 2.0 are marked
-*(2.0)*.
 
-*Note: Models marked '(SMP)'can have multiple CPUs but NetBSD/sparc does not
-use more than one CPU prior to release 2.0*
+*Note: Models marked '(SMP)'can have multiple CPUs.*
 
 ### Sun sun4m machines (all known SuperSPARC, hyperSPARC, microSPARC, and TurboSPARC CPUs are supported):
 
@@ -39,8 +36,8 @@
 * SPARCstation/server 20 ([SMP](http://www.NetBSD.org/ports/sparc/faq.html#smp-cpus))
 * SPARCstation Voyager (See the [FAQ](http://www.NetBSD.org/ports/sparc/faq.html) regarding PCMCIA support)
 * Sun '[Fox](http://www.NetBSD.org/ports/sparc/faq.html#fox)'
-* [JavaStation-1](http://www.NetBSD.org/ports/sparc/javastation.html#mrcoffe) (a.k.a. "Mr. Coffee" or JavaStation JJ) (2.0)
-* [JavaStation-NC](http://www.NetBSD.org/ports/sparc/javastation.html#krups) (a.k.a. Krups, JavaStation JK, or JavaStation-10) (2.0)
+* [JavaStation-1](http://www.NetBSD.org/ports/sparc/javastation.html#mrcoffe) (a.k.a. "Mr. Coffee" or JavaStation JJ)
+* [JavaStation-NC](http://www.NetBSD.org/ports/sparc/javastation.html#krups) (a.k.a. Krups, JavaStation JK, or JavaStation-10)
 
 ### Sun4m compatibles (including):
 * Axil 245 (SS5 clone), 311, 320 (SS20 clone)

fix error made in the conversion to wiki: broken link to arm32.
while here, tweak wording a bit
Members: 
	ports/shark.mdwn:1.6->1.7 

Index: wikisrc/ports/shark.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/shark.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/shark.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/shark.mdwn	22 May 2015 05:58:08 -0000	1.7
@@ -11,8 +11,8 @@
 NetBSD/shark is a port of NetBSD to StrongARM based Digital DNARD ("Shark")
 machines.
 
-Up until the release of NetBSD 1.6, this port used to be part of the
-[NetBSD/arm32 port](/ports/arm32).
+Prior to the release of NetBSD 1.6, this port was part of the
+[NetBSD/arm32 port](http://www.NetBSD.org/ports/arm32/index.html).
 """
 additional="""
 * [NetBSD/shark FAQ](http://www.NetBSD.org/ports/shark/faq.html)

tweak wording, man-link-ify
Index: wikisrc/ports/sgimips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sgimips.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/sgimips.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/sgimips.mdwn	22 May 2015 05:55:40 -0000	1.7
@@ -7,9 +7,9 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/sgimips/o2.gif"
 about="""
-NetBSD/sgimips is a port of NetBSD to the MIPS processor based computers by [Silicon Graphics](http://www.sgi.com/).
+NetBSD/sgimips is a port of NetBSD to the MIPS processor based computers from [Silicon Graphics](http://www.sgi.com/).
 
-NetBSD is the world's first Open Source operating system running on Silicon Graphics O2. 
+NetBSD was the world's first Open Source operating system to run on the Silicon Graphics O2. 
 """
 supported_hardware="""
 ###Supported System Models
@@ -35,24 +35,24 @@
 
 ###Supported Peripherals
 
-* On-board Z8530 serial interface (zsc)
-* On-board SEEQ 80c03 ethernet interface (sq)
-* On-board WD33C93 SCSI interface (wdsc)
-* On-board HAL2 audio interface (haltwo)
-* On-board AIC7880 wide SCSI interface on O2 (ahc)
-* On-board NS16550 based serial interface on O2 (com)
-* On-board MACE MAC-110 Ethernet on O2 (mec)
-* On-board framebuffer on O2 (crmfb) (-current)
-* On-board PS/2 keyboard/mouse on O2 (macekbc, pckbd, pms) (-current)
-* On-board Moosehead audio interface on O2 (mavb) (-current)
-* On-board framebuffer on Indy (newport)
-* On-board PC-style keyboard/mouse on Indy (pckbc, pckbd, pms)
-* On-board framebuffer on Indigo (grtwo, light)
+* On-board Z8530 serial interface ([[!template id=man name="zsc" section="4"]])
+* On-board SEEQ 80c03 ethernet interface ([[!template id=man name="sq" section="4" arch="sgimips"]])
+* On-board WD33C93 SCSI interface ([[!template id=man name="wdsc" section="4" arch="sgimips"]])
+* On-board HAL2 audio interface ([[!template id=man name="haltwo" section="4" arch="sgimips"]])
+* On-board AIC7880 wide SCSI interface on O2 ([[!template id=man name="ahc" section="4"]])
+* On-board NS16550 based serial interface on O2 ([[!template id=man name="com" section="4"]])
+* On-board MACE MAC-110 Ethernet on O2 ([[!template id=man name="mec" section="4" arch="sgimips"]])
+* On-board framebuffer on O2 (crmfb)
+* On-board PS/2 keyboard/mouse on O2 (macekbc, [[!template id=man name="pckbd" section="4"]], [[!template id=man name="pms" section="4"]])
+* On-board Moosehead audio interface on O2 ([[!template id=man name="mavb" section="4" arch="sgimips"]])
+* On-board framebuffer on Indy ([[!template id=man name="newport" section="4" arch="sgimips"]])
+* On-board PC-style keyboard/mouse on Indy ([[!template id=man name="pckbc" section="4"]], [[!template id=man name="pckbd" section="4"]], [[!template id=man name="pms" section="4"]])
+* On-board framebuffer on Indigo ([[!template id=man name="grtwo" section="4" arch="sgimips"]], [[!template id=man name="light" section="4" arch="sgimips"]])
 * On-board Z8530 based keyboard/mouse on Indigo (zsc, zskbd, zsms)
-* E++ GIO Ethernet Adapter (sq) (-current)
-* GIO32 SCSI Adapter (wdsc) (-current)
-* Phobos GIO G100/G130/G160 Fast Ethernet (tlp) (NetBSD 4.0/-current)
-* Set Engineering GIO 100baseTX Fast Ethernet (tl) (-current)
+* E++ GIO Ethernet Adapter ([[!template id=man name="sq" section="4" arch="sgimips"]])
+* GIO32 SCSI Adapter ([[!template id=man name="wdsc" section="4" arch="sgimips"]])
+* Phobos GIO G100/G130/G160 Fast Ethernet ([[!template id=man name="tlp" section="4"]])
+* Set Engineering GIO 100baseTX Fast Ethernet ([[!template id=man name="tl" section="4"]])
 * Most MI PCI devices
 * MI SCSI devices
 

sbmips is no longer a "new" port
Index: wikisrc/ports/sbmips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sbmips.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/sbmips.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/sbmips.mdwn	22 May 2015 04:21:17 -0000	1.7
@@ -9,7 +9,7 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/sbmips/sibyte.png"
 about="""
-NetBSD/sbmips is a new port of NetBSD to Broadcom's SiByte Broadband Processor. 
+NetBSD/sbmips is a port of NetBSD to Broadcom's SiByte Broadband Processor. 
 """
 supported_hardware="""
 ##Supported System Models

no dice on the previous. avoid the issue by killing the parens.
can we turn off that ridiculous ikiwiki smiley feature?
Index: wikisrc/ports/sandpoint.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sandpoint.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/ports/sandpoint.mdwn	22 May 2015 04:18:26 -0000	1.11
+++ wikisrc/ports/sandpoint.mdwn	22 May 2015 04:19:43 -0000	1.12
@@ -39,7 +39,7 @@
     -   CH3WNAS [[1](#untested)]
 
 -   D-Link
-    -   DSM-G600 \(Rev. B\)
+    -   DSM-G600, Rev. B
 
 -   Encore
     -   ENNHD-1000 [[1](#untested)]

(hopefully) fix an error in the conversion to ikiwiki: avoid turning
"B)" into a stupid smiley graphic.
Index: wikisrc/ports/sandpoint.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sandpoint.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/ports/sandpoint.mdwn	6 Oct 2014 21:41:29 -0000	1.10
+++ wikisrc/ports/sandpoint.mdwn	22 May 2015 04:18:26 -0000	1.11
@@ -12,7 +12,7 @@
 [Sandpoint](http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=SANDPOINTX3&parentCode=MPC8240&nodeId=03C1TR046708718655)
 reference platform.
 
-The Sandpoint is a reference platform designed by Motorola to help
+Sandpoint is a reference platform designed by Motorola to help
 people develop hardware and software around various PowerPC processors.
 The basic system is an ATX form-factor motherboard with standard PC
 devices (IDE, floppy, serial, parallel), 4 PCI slots, and a mezzanine
@@ -39,7 +39,7 @@
     -   CH3WNAS [[1](#untested)]
 
 -   D-Link
-    -   DSM-G600 \(Rev. B)
+    -   DSM-G600 \(Rev. B\)
 
 -   Encore
     -   ENNHD-1000 [[1](#untested)]

provide current info and 6.0 changes junk
Index: wikisrc/ports/rs6000.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/rs6000.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/ports/rs6000.mdwn	18 Jan 2014 00:11:19 -0000	1.4
+++ wikisrc/ports/rs6000.mdwn	22 May 2015 04:10:15 -0000	1.5
@@ -1,6 +1,8 @@
 [[!template id=port
 port="rs6000"
+cur_rel="6.1.5"
 future_rel="7.0"
+changes_cur="6.0"
 changes_future="7.0"
 about="""
 NetBSD/rs6000 is a port of NetBSD to the IBM RS/6000 class of MCA-based

supported in -> supported by
Index: wikisrc/ports/prep.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/prep.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/prep.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/prep.mdwn	22 May 2015 04:07:14 -0000	1.7
@@ -12,7 +12,7 @@
 """
 supported_hardware="""
 ##Supported System Models
-Currently the following models are supported in NetBSD/prep:
+Currently the following models are supported by NetBSD/prep:
 
 * IBM 6015 (40P)
 * IBM 6040 (ThinkPad 820)

prune crusty old text. decrustify and englishify the remains.
Index: wikisrc/ports/pmax.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/pmax.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/pmax.mdwn	6 Oct 2014 21:41:29 -0000	1.7
+++ wikisrc/ports/pmax.mdwn	22 May 2015 04:05:55 -0000	1.8
@@ -8,13 +8,9 @@
 thumbnail="http://www.netbsd.org/images/ports/pmax/5000.gif"
 about="""
 NetBSD/pmax is the port of NetBSD to Digital Equipment Corporation's MIPS based
-computers. NetBSD/pmax runs on wide range of DECstation and DECsystem family.
-NetBSD/pmax is the first port which can run on either MIPS R3000 processors or
-MIPS R4400 processors; single kernel can run common set of user programs.
-
-Development activity on NetBSD/pmax continues at a speed depending of people's
-spare time. NetBSD/pmax developers are making efforts on extending hardware
-supports to models which NetBSD/pmax does not support this moment. 
+computers. NetBSD/pmax runs on a wide range of DECstation and DECsystem systems.
+NetBSD/pmax is able to run on either MIPS R3000 processors or MIPS R4400
+processors; a single kernel can run a common set of user programs.
 """
 supported_hardware="""
 ###Supported System Models

fix an error made in the conversion to wikisrc: provide an anchor so that
the link (on this very same page) to the section still works.
Index: wikisrc/ports/next68kfaq.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/next68kfaq.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/next68kfaq.mdwn	17 Jan 2014 21:50:34 -0000	1.3
+++ wikisrc/ports/next68kfaq.mdwn	22 May 2015 03:45:33 -0000	1.4
@@ -4,7 +4,7 @@
 
 # Booting
 
-## How do I get to the ROM Monitor or the debugger?
+## How do I get to the ROM Monitor or the debugger?<a name="rom-monitor">
 
 You can get to the ROM monitor or break into the debugger (once the
 NetBSD kernel is running) at any time by hitting both **COMMAND** and

prune stale qualifying statement
Index: wikisrc/ports/next68k.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/next68k.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/next68k.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/next68k.mdwn	22 May 2015 03:44:20 -0000	1.7
@@ -10,8 +10,7 @@
 NetBSD/next68k is a port of NetBSD to the 'black' 68k NeXT hardware.
 
 It currently only runs on 68040 NeXT systems using non-ADB keyboard and
-mouse. There is experimental support for turbo NeXT machines (33Mhz) in
-NetBSD-current.
+mouse. There is experimental support for turbo NeXT machines (33Mhz).
 
 Darrin B. Jewell is the maintainer of NetBSD/next68k.
 

"on going" -> "ongoing"
Index: wikisrc/ports/newsmips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/newsmips.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/newsmips.mdwn	22 May 2015 03:28:10 -0000	1.6
+++ wikisrc/ports/newsmips.mdwn	22 May 2015 03:29:14 -0000	1.7
@@ -51,7 +51,7 @@
 
 
 -   IOP based systems (NWS-3800 series)
--   R4600 based systems (NWS-4000 series; on going)
+-   R4600 based systems (NWS-4000 series; ongoing)
 -   internal floppy disk
 -   other framebuffers not listed above
 -   COMPAT\_NEWSOS

minor wording improvements and man-link-ification
Index: wikisrc/ports/newsmips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/newsmips.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/newsmips.mdwn	6 Oct 2014 21:41:29 -0000	1.5
+++ wikisrc/ports/newsmips.mdwn	22 May 2015 03:28:10 -0000	1.6
@@ -10,15 +10,15 @@
 STATION" series. [More information](http://www.NetBSD.org/ports/newsmips/history.html) on these machines is
 available.
 
-NetBSD/newsmips port is based on NetBSD/{mips,pmax} and 4.4BSD Lite2.
+THe NetBSD/newsmips port is based on NetBSD/{mips,pmax} and 4.4BSD Lite2.
 
-m68k based NEWS machines are supported by [[NetBSD/news68k|news68k]]
+m68k based NEWS machines are supported by the [[NetBSD/news68k|news68k]]
 port.
 """
 supported_hardware="""
 ## Supported System Models
 
-Currently only single CPU models are supported in NetBSD/newsmips.
+Currently only single CPU models are supported by NetBSD/newsmips.
 
 -   R3000 and hyper-bus based models:
     -   NWS-3470D
@@ -32,16 +32,16 @@
 
 ## Supported Peripherals
 
--   On-board LANCE ethernet interface (*le*)
--   On-board SONIC ethernet interface (*sn*)
--   On-board SONY CXD1185 SCSI interface (*sc*)
+-   On-board LANCE ethernet interface ([[!template id=man name="le" section="4"]])
+-   On-board SONIC ethernet interface ([[!template id=man name="sn" section="4"]])
+-   On-board SONY CXD1185 SCSI interface ([[!template id=man name="sc" section="4"]])
 -   On-board HP SPIFI3-SE SCSI interface (*spifi*)
 -   Most SCSI devices
--   On-board Z8530 serial interface (*zsc*)
+-   On-board Z8530 serial interface ([[!template id=man name="zsc" section="4"]])
 -   keyboard (*kb*) and mouse (*ms*)
 -   NWB-253 framebuffer (*fb*) (text only)
 -   "XA" framebuffer on news5000 (*xafb*) (text only)
--   NWB-5852A 100BaseTX ethernet interface (*tlp*)
+-   NWB-5852A 100BaseTX ethernet interface ([[!template id=man name="tlp" section="4"]])
 
 """
 unsupported_hardware="""

fix two mistakes made in the conversion to wikisrc:
- broken link to mailing list
- no anchor on DIP switch section, causing #dip_sw to fail
while here, prune a yob's comma
Members: 
	ports/news68kfaq.mdwn:1.2->1.3 

Index: wikisrc/ports/news68kfaq.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/news68kfaq.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/ports/news68kfaq.mdwn	17 Jan 2014 14:57:50 -0000	1.2
+++ wikisrc/ports/news68kfaq.mdwn	22 May 2015 03:18:44 -0000	1.3
@@ -54,7 +54,7 @@
 but on some NEWS models the NVRAM might be soldered to the mainboard
 without a socket :-(
 
-## How should I set the DIP switches?
+## How should I set the DIP switches?<a name="dip_sw">
 news68k machines have one block of 8 dip switches:
 
 ### Table 1
@@ -224,7 +224,7 @@
 The one problem is that news800 models also use an I/O processor, which
 is mentioned in the above entry. Another problem is that news800 uses
 m68020 and Sony's own MMU, not Motorola's m68851 MMU. news700 also has
-an original MMU like news800. There is little information about it,
+an original MMU like news800. There is little information about it
 either.
 
 * * * * *
@@ -233,10 +233,10 @@
 
 ## Other sources of information from NetBSD.org
 
--   [NetBSD/news68k 6.0 install
-    notes](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0/news68k/INSTALL.html) - supported hardware and how to install.
+-   [NetBSD/news68k 6.1.5 install
+    notes](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1.5/news68k/INSTALL.html) - supported hardware and how to install.
 
--   [port-news68k mail list](../../mailinglists/#port-news68k)
+-   [port-news68k mail list](http://www.NetBSD.org/mailinglists/#port-news68k)
     ([archive](http://mail-index.NetBSD.org/port-news68k/)) - if you
     have any additional questions please subscribe.
 

minor wording improvement
Index: wikisrc/ports/news68k.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/news68k.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/news68k.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/news68k.mdwn	22 May 2015 03:10:34 -0000	1.7
@@ -18,7 +18,7 @@
 supported_hardware="""
 ## Supported system models
 
-Currently only single mc68030 based models are supported in
+Currently only single mc68030 based models are supported by
 NetBSD/news68k.
 
 -   NWS-1750

6.0 binary packages are available
Index: wikisrc/ports/netwinder.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/netwinder.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/ports/netwinder.mdwn	22 May 2015 02:59:31 -0000	1.4
+++ wikisrc/ports/netwinder.mdwn	22 May 2015 03:00:33 -0000	1.5
@@ -2,6 +2,7 @@
 port="netwinder"
 cur_rel="6.1.5"  
 future_rel="7.0"
+pkg_rel="6.0"
 changes_cur="6.0"
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/netwinder/2100.gif"

sorry, but netwinder is not a new port.
Index: wikisrc/ports/netwinder.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/netwinder.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/netwinder.mdwn	6 Oct 2014 21:41:29 -0000	1.3
+++ wikisrc/ports/netwinder.mdwn	22 May 2015 02:59:31 -0000	1.4
@@ -6,7 +6,7 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/netwinder/2100.gif"
 about="""
-NetBSD/netwinder is a new port of NetBSD to StrongARM based NetWinder machines.
+NetBSD/netwinder is a port of NetBSD to StrongARM based NetWinder machines.
 """
 ]]
 [[!tag tier2port]]

nothing about mvme68k hardware is new. clarify wording.
Index: wikisrc/ports/mvme68k.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/mvme68k.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/mvme68k.mdwn	6 Oct 2014 21:41:29 -0000	1.7
+++ wikisrc/ports/mvme68k.mdwn	22 May 2015 02:49:20 -0000	1.8
@@ -9,13 +9,12 @@
 about="""
 NetBSD/mvme68k is the port of NetBSD to Motorola's 68k VME Single Board
 Computers (SBC). The first Motorola SBC was introduced in 1988. Motorola
-has continued development on 68k and PowerPC based SBC VME modules.
+developed various 68k and PowerPC based SBC VME modules.
 
-Development activity on NetBSD/mvme68k continues at a speed that depends
-on people's spare time and access to hardware. NetBSD runs on the
-original Motorola 68k VME SBC (MVME147), the 68040 based MVME162 (LX
-200/300 and the new P2/P4 series based on the Petra ASIC), MVME167 and
-the 68060 based MVME172 (LX 200/300 and Petra P2/P4) and MVME177 boards.
+NetBSD runs on the original Motorola 68k VME SBC (MVME147), the 68040 based
+MVME162 (LX 200/300 and the P2/P4 series based on the Petra ASIC) and MVME167,
+as well as the 68060 based MVME172 (LX 200/300 and Petra P2/P4) and MVME177
+boards.
 """
 supported_hardware="""
 These are the Motorola Single Board Computers that NetBSD/mvme68k

fix wikisrc conversion error: yet another broken link
Index: wikisrc/ports/sh3.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sh3.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/sh3.mdwn	10 Jan 2014 22:48:42 -0000	1.3
+++ wikisrc/ports/sh3.mdwn	22 May 2015 02:41:35 -0000	1.4
@@ -79,8 +79,8 @@
 -   <mailto:port-sh3@NetBSD.org> - if you have any additional
     questions please subscribe.
 
--   [General NetBSD Documentation](../../docs/) - for questions not
-    specific to NetBSD/sh3.
+-   [General NetBSD Documentation](http://www.NetBSD.org/docs/) - for questions
+    not specific to NetBSD/sh3.
 
 * * * * *
 

fix wording
Index: wikisrc/ports/mmeye.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/mmeye.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/mmeye.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/mmeye.mdwn	22 May 2015 02:40:05 -0000	1.7
@@ -7,7 +7,7 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/mmeye/mmeye.gif"
 about="""
-All info is at [[sh3 port page|sh3]]
+All information about this port is at the [[sh3 port page|sh3]].
 """
 ]]
 [[!tag tier2port]]

update a couple links that were broken in the transition to wikisrc.
while here, update the laughable text describing macppc as a relatively
new NetBSD port.
Index: wikisrc/ports/macppc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/macppc.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/macppc.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/macppc.mdwn	22 May 2015 02:37:34 -0000	1.7
@@ -7,11 +7,11 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/macppc/macs.gif"
 about="""
-NetBSD/macppc is a relatively new NetBSD port. The first binary release
-for macppc was [NetBSD 1.4](http://www.NetBSD.org/releases/formal-1.4/).
-It supports most Apple Power Macintosh computers with PowerPC processors
-and Open Firmware. For older (680x0-based) Macintosh computers, see
-[[NetBSD/mac68k|mac68k]]. There is also an experimental
+NetBSD/macppc is a port to Apple's PowerPC-based Macintosh computers
+with Open Firmware.  For older (680x0-based) Macintosh computers, see
+[[NetBSD/mac68k|mac68k]].  The first binary release for macppc was
+[NetBSD 1.4](http://www.NetBSD.org/releases/formal-1.4/)  There is also
+an experimental
 [[NetBSD/bebox|bebox]] port for Be, Inc's PowerPC-based BeBox.
 
 """
@@ -46,7 +46,7 @@
 
 -   Performa 4400, 54xx, 5500, 6300/160, 6360, 6400, 6500
 -   Power Macintosh 7300, 7600, 8500
--   Power Macintosh 7500 with new [CPU card](faq.html#601)
+-   Power Macintosh 7500 with new [CPU card](http://www.netbsd.org/ports/macppc/faq.html#601)
 -   Power Macintosh 8600/200,250,300
 -   Power Macintosh 9500/120,133
 -   Power Macintosh 9500/150,180,180MP,200
@@ -107,8 +107,7 @@
 additional="""
 -   [NetBSD/macppc FAQ](http://www.NetBSD.org/ports/macppc/faq.html)
 -   [NetBSD/macppc Model Support Page](http://www.NetBSD.org/ports/macppc/models.html)
--   [System Disk Tutorial](http://www.NetBSD.org/ports/macppc/SystemDisk-tutorial/) (for new users to Open
-    Firmware)
+-   [System Disk Tutorial](http://www.netbsd.org/ports/macppc/SystemDisk-tutorial/index.html) (for new users to Open Firmware)
 
 """
 

fix link to the booter manual
Index: wikisrc/ports/mac68k.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/mac68k.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/ports/mac68k.mdwn	24 Dec 2014 05:06:10 -0000	1.9
+++ wikisrc/ports/mac68k.mdwn	22 May 2015 02:21:07 -0000	1.10
@@ -67,7 +67,7 @@
 """
 additional="""
 * [NetBSD/mac68k Meta-FAQ](http://www.NetBSD.org/ports/mac68k/meta-faq.html)
-* [BSD/mac68k Booter Manual](http://www.NetBSD.org/ports/mac68k/booter-manual/)
+* [BSD/mac68k Booter Manual](http://www.NetBSD.org/ports/mac68k/booter-manual/index.html)
 * [NetBSD/mac68k Supported hardware](http://www.NetBSD.org/ports/mac68k/hardware.html)
 * [History of NetBSD/mac68k](http://www.NetBSD.org/ports/mac68k/history.html)
 * Matthew Theobald's [NetBSD/mac68k Installation Guide](http://www.NetBSD.org/ports/mac68k/theobald/)

remove x11r6 reference
Index: wikisrc/ports/luna68k/luna68k_info.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/luna68k/luna68k_info.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/ports/luna68k/luna68k_info.mdwn	15 Jan 2014 13:03:06 -0000	1.1
+++ wikisrc/ports/luna68k/luna68k_info.mdwn	21 May 2015 20:54:40 -0000	1.2
@@ -196,7 +196,7 @@
 
 # Future work<a name="futurework"></a>
 
-X11R6 Xserver; should not be hard.
+X server; should not be hard.
 The X Consortium X11 release contains code for UNIOS-B/Mach2.5.
 NetBSD/luna68k has the WSCONS interface, and the porting effort
 will be concentrated around this point.

adjust link to iyonix.com. main page is dead, and there's at least a little
bit of iyonix-specific info on their RISC OS 5 page.
Index: wikisrc/ports/iyonix.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/iyonix.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/iyonix.mdwn	6 Oct 2014 21:41:29 -0000	1.5
+++ wikisrc/ports/iyonix.mdwn	21 May 2015 20:47:09 -0000	1.6
@@ -6,7 +6,7 @@
 changes_cur="6.0"
 changes_future="7.0"
 about="""
-NetBSD/iyonix is a port of NetBSD to Castle Technology's [Iyonix](http://www.iyonix.com/)
+NetBSD/iyonix is a port of NetBSD to Castle Technology's [Iyonix](http://www.iyonix.com/32bit/)
 computers, an ARM based PC. It was first committed to the NetBSD source tree on
 October 13th, 2004.
 

fill in some port info: current release, packages, 6.0 changes
Index: wikisrc/ports/ibmnws.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/ibmnws.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/ibmnws.mdwn	18 Jan 2014 00:11:19 -0000	1.3
+++ wikisrc/ports/ibmnws.mdwn	21 May 2015 20:40:34 -0000	1.4
@@ -1,6 +1,9 @@
 [[!template id=port
 port="ibmnws"
+cur_rel="6.1.5"
 future_rel="7.0"
+pkg_rel="6.0"
+changes_cur="6.0"
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/ibmnws/nws1000.png"
 about="""

HP doesn't seem to be involved with ski anymore. It lives on sourceforge
now.
Index: wikisrc/ports/ia64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/ia64.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/ia64.mdwn	18 Jan 2014 00:11:19 -0000	1.3
+++ wikisrc/ports/ia64.mdwn	21 May 2015 20:34:59 -0000	1.4
@@ -12,8 +12,8 @@
 the project if you have i386 hardware. See the [[FAQ|ia64_faq]] for more information.
 
 Basic infrastructure you need to get involved at this stage is
-[[NetBSD/i386|i386]], and [HP](http://www.hp.com/)'s
-[ski](http://www.hpl.hp.com/research/linux/ski/) simulator.
+[[NetBSD/i386|i386]], and the 
+[ski](http://ski.sourceforge.net/) simulator.
 
 If you would like to contribute to the porting effort, read this web-page
 carefully, and then feel free to ask us questions on the

fix broken link to system support page. remove processor support section
that gives no useful info.
Index: wikisrc/ports/hpcsh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hpcsh.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/hpcsh.mdwn	6 Oct 2014 21:41:29 -0000	1.7
+++ wikisrc/ports/hpcsh.mdwn	21 May 2015 20:29:23 -0000	1.8
@@ -29,14 +29,9 @@
 ## Supported System Models
 
 Many kinds of H/PC, H/PC Pro, and PsPC systems are supported by
-NetBSD/hpcsh. View [the supported system table](#supported) to see if
+NetBSD/hpcsh. View [[the supported system table|hpcsh_support_status]] to see if
 your system is supported.
 
-## Supported Processors
-
-sh3 processors are supported by NetBSD/hpcsh. View [the processor
-comparison table](#processors) to see if your processor is supported.
-
 ## Support Status
 
 [[Support Status list|hpcsh_support_status]]

link to the wikified supported machines table.
Index: wikisrc/ports/hpcmips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hpcmips.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/ports/hpcmips.mdwn	6 Oct 2014 21:41:29 -0000	1.9
+++ wikisrc/ports/hpcmips.mdwn	21 May 2015 20:22:36 -0000	1.10
@@ -28,7 +28,8 @@
 ## Supported System Models
 
 Many kinds of H/PC, H/PC Pro, and PsPC systems are supported by NetBSD/hpcmips.
-View the supported system table to see if your system is supported.
+View the [[supported machines table|supported_machines]] to see if your system
+is supported.
 
 ## Supported Processors
 

per a hint from mlelstv, use templatebody to get rid of the linefeed
that was being inserted after generated man page links.
Index: wikisrc/templates/man.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/man.mdwn,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wikisrc/templates/man.mdwn	5 Feb 2012 01:51:09 -0000	1.18
+++ wikisrc/templates/man.mdwn	20 May 2015 06:17:25 -0000	1.19
@@ -1,3 +1,4 @@
+[[!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_UNLESS name>
 ## Description
 
@@ -26,3 +27,4 @@
 
         \[[!template id=man name="ls" section="1" arch="i386" collection="NetBSD-5.0"]]
 </TMPL_UNLESS>
+ENDBODY]]

hp700 is now hppa
Index: wikisrc/ports/hp300.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/hp300.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/ports/hp300.mdwn	6 Oct 2014 21:41:29 -0000	1.8
+++ wikisrc/ports/hp300.mdwn	20 May 2015 03:30:30 -0000	1.9
@@ -10,7 +10,7 @@
 NetBSD/hp300 is the port of NetBSD to Hewlett-Packard 9000 Series 300 and 400
 workstations. It runs on almost all workstations from this generation. Series
 700 and 800 workstations are not currently supported, but work is underway on
-[[NetBSD/hp700|hp700]].
+[[NetBSD/hppa|hp700]].
 
 NetBSD/hp300 is based on work done by David P. Davis at the University of
 California, Berkeley and the Systems Programming Group at the University of Utah
@@ -184,7 +184,7 @@
 Here are a few links that might be of interest to anyone with HP hardware not
 supported by NetBSD/hp300:
 
-* [NetBSD/hp700](ports/hp700)
+* [NetBSD/hppa](ports/hp700)
 * [HP9000/300 Linux](http://www.tazenda.demon.co.uk/phil/linux-hp/)
 * [Apollo Frequently Asked Questions](http://mit.edu/kolya/www/csa-faq.html)
 * [Apollo/DOMAIN Computer Info](http://www.zepa.net/apollo/)

fix formatting error introduced in the conversion to wiki
Index: wikisrc/ports/ews4800mips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/ews4800mips.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/ews4800mips.mdwn	6 Oct 2014 21:41:29 -0000	1.5
+++ wikisrc/ports/ews4800mips.mdwn	20 May 2015 03:26:21 -0000	1.6
@@ -27,7 +27,6 @@
 """
 unsupported_hardware="""
 * All other models not listed the above (needs hardware info)
-
 * All APbus devices (including framebuffer on EWS4800/360SX)
 * internal floppy disk
 * parallel port

english fix
Index: wikisrc/ports/evbsh3.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbsh3.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/evbsh3.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/evbsh3.mdwn	20 May 2015 03:24:09 -0000	1.6
@@ -9,7 +9,7 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/evbsh3/cqreek.gif"
 about="""
-All info is at [[sh3 port page|sh3]]
+All info is at the [[sh3 port page|sh3]]
 
 """
 ]]

fix three broken links introduced in the move to wiki
Index: wikisrc/ports/evbmips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbmips.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/evbmips.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/evbmips.mdwn	20 May 2015 03:19:11 -0000	1.6
@@ -26,9 +26,9 @@
  * [Senao/Engenius 5354AP1 Aries2](http://datacom.engeniustech.com/products_detail.php?name=35&cat=Wireless%20AP/Client%20Bridge/Router)
 """
 additional="""
-  * [Running NetBSD on emulated hardware](../emulators.html)
-  * The [NetBSD Diskless HOWTO](../../docs/network/netboot/)
-  * [NetBSD on Senao 5354AP1 Aries2 HOWTO](ARIES2_HOWTO.txt)
+  * [Running NetBSD on emulated hardware](http://www.NetBSD.org/ports/emulators.html)
+  * The [NetBSD Diskless HOWTO](http://www.NetBSD.org/docs/network/netboot/)
+  * [NetBSD on Senao 5354AP1 Aries2 HOWTO](http://www.NetBSD.org/ports/evbmips/ARIES2_HOWTO.txt)
 """
 
 ]]

sorry, but more information about the ADI BRH can't be found on ADI's site.
Index: wikisrc/ports/evbarm.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm.mdwn,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wikisrc/ports/evbarm.mdwn	4 May 2015 10:47:18 -0000	1.20
+++ wikisrc/ports/evbarm.mdwn	20 May 2015 03:15:51 -0000	1.21
@@ -25,9 +25,7 @@
 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. More information about
-the BRH can be found on [ADI Engineering's web
-page](http://www.adiengineering.com/productsBRH.html).
+NetBSD currently only supports little-endian operation.
 
 Support for the BRH was written by Jason Thorpe, and contributed by Wasabi
 Systems, Inc.

two errors made in the conversion to wikisrc:
- broken link to the arm32 page
- bogus formatting in the board list
Index: wikisrc/ports/cats.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/cats.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/cats.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/cats.mdwn	20 May 2015 03:01:34 -0000	1.6
@@ -10,13 +10,14 @@
 NetBSD/cats is an port of NetBSD to the [Simtec Electronics](http://www.simtec.co.uk/products/EB110ATX/)
 CATS motherboard and [Intel](http://www.intel.com/) EBSA board.
 
-Up until the release of NetBSD 1.6, this port was a part of the [NetBSD/arm32](ports/arm32)
+Up until the release of NetBSD 1.6, this port was a part of the [NetBSD/arm32](http://www.NetBSD.org/ports/arm32/index.html)
 port. With the release of 1.6, cats is now maintained as a separate port, using
 the core arm functionality. 
 """
 supported_hardware="""
 ###Supported System Models
 These are the machines/boards this port is targeting:
+
 * Simtec's cats
 * Intel EBSA evaluation board
 

fix an error made in the conversion to wikisrc: broken formatting on
the system list.
Index: wikisrc/ports/bebox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/bebox.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/bebox.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/bebox.mdwn	20 May 2015 02:57:05 -0000	1.6
@@ -14,6 +14,7 @@
 supported_hardware="""
 ###Supported System Models
 All BeBox models/revisions are supported in NetBSD/bebox.
+
 * BeBox Dual603-66
 * BeBox Dual603-133
 

fix an error in the conversion to wiki: correct broken link
Index: wikisrc/ports/amigappc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amigappc.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/amigappc.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/amigappc.mdwn	20 May 2015 02:45:26 -0000	1.6
@@ -12,7 +12,7 @@
 boards as manufactured by Phase 5.
 
 Supported peripheral devices will basically be the same as with
-[NetBSD/amiga](ports/amiga).  Currently, we do not plan to create any binary
+[NetBSD/amiga](../amiga).  Currently, we do not plan to create any binary
 release, but development will continue and is in fact, easier, now that
 cross-compilation of the base system is supported within NetBSD-current.
 """

english fix
Index: wikisrc/ports/amiga.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amiga.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/ports/amiga.mdwn	6 Oct 2014 21:41:28 -0000	1.9
+++ wikisrc/ports/amiga.mdwn	20 May 2015 02:43:41 -0000	1.10
@@ -22,7 +22,7 @@
 to run NetBSD.
 
 The minimum RAM requirement is about 24 MB FASTMEM, the minimum hard disk space
-needed is about 250 MB, depending on how much system components you install.
+needed is about 250 MB, depending on how many system components you install.
 Check the install document for more details. 
 """
 supported_hardware="""

take two PRs off of this silly little test of a list
Index: wikisrc/users/snj.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/snj.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/snj.mdwn	30 Dec 2009 04:12:43 -0000	1.3
+++ wikisrc/users/snj.mdwn	20 May 2015 02:31:54 -0000	1.4
@@ -1,11 +1,10 @@
 Orange :(
 
-P.S. Ugly emoticon graphics too!
+Ugly emoticon graphics too!
 
 -Søren
 
 Here's some stuff I really wish Someone(tm) would fix:
+
 * [[!template id=pr number=34735]]
-* [[!template id=pr number=39016]]
 * [[!template id=pr number=39371]]
-* [[!template id=pr number=40594]]

Algorithmics, LTD is a "was" these days. Provide links to driver man pages.
Index: wikisrc/ports/algor.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/algor.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/algor.mdwn	6 Oct 2014 21:41:28 -0000	1.6
+++ wikisrc/ports/algor.mdwn	20 May 2015 02:06:09 -0000	1.7
@@ -7,8 +7,8 @@
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/algor/alogo2.gif"
 about="""
-NetBSD/algor is the port of NetBSD to the Algorithmics, Ltd. MIPS evaluations
-boards. Algorithmics is a long-time supplier of MIPS evaluation/prototyping
+NetBSD/algor is the port of NetBSD to the Algorithmics, Ltd. MIPS evaluation
+boards. Algorithmics was a long-time supplier of MIPS evaluation/prototyping
 products and expertise.
 
 Algorithmics boards include PCI and PC-like on-board peripherals, and have a CPU
@@ -30,16 +30,16 @@
 ###Supported Peripherals
 
 * Algorithmics P-4032
-    * On-board NCR53c810 SCSI on the PCI bus (siop)
-    * On-board DECchip 21041 Ethernet on the PCI bus (tlp)
-    * On-board real-time clock (mcclock)
-    * On-board NS16550-compatible serial ports (com)
+    * On-board NCR53c810 SCSI on the PCI bus ([[!template id=man name="siop" section="4"]])
+    * On-board DECchip 21041 Ethernet on the PCI bus ([[!template id=man name="tlp" section="4"]])
+    * On-board real-time clock ([[!template id=man name="mcclock" section="4"]])
+    * On-board NS16550-compatible serial ports ([[!template id=man name="com" section="4"]])
     * Other devices inserted into the PCI expansion slots
 * Algorithmics P-5064
-    * On-board NCR53c810 SCSI on the PCI bus (siop)
-    * On-board DECchip 21143 Ethernet on the PCI bus (tlp)
-    * On-board real-time clock on the ISA bus (mcclock)
-    * On-board NS16550-compatible serial ports on the ISA bus (com)
+    * On-board NCR53c810 SCSI on the PCI bus ([[!template id=man name="siop" section="4"]])
+    * On-board DECchip 21143 Ethernet on the PCI bus ([[!template id=man name="tlp" section="4"]])
+    * On-board real-time clock on the ISA bus ([[!template id=man name="mcclock" section="4"]])
+    * On-board NS16550-compatible serial ports on the ISA bus ([[!template id=man name="com" section="4"]])
     * On-board floppy controller on the ISA bus (fdc)
     * Other devices inserted into the PCI expansion slots
 

fix two issues with the wiki conversion:
- unbreak a link
- use the man template instead of hardcoding a 5.1 manpage link
Index: wikisrc/ports/amd64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amd64.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/ports/amd64.mdwn	19 May 2015 18:38:16 -0000	1.13
+++ wikisrc/ports/amd64.mdwn	19 May 2015 20:54:57 -0000	1.14
@@ -13,7 +13,7 @@
 
 NetBSD/amd64 is a true 64bit operating system. Running
 32-bit NetBSD/i386 binaries is supported as well; see 
-<a href="http://netbsd.gw.com/cgi-bin/man-cgi?compat_netbsd32+8+NetBSD-5.1+i386">compat_netbsd32(8)</a>.
+[[!template id=man name="compat_netbsd32" section="8"]].
 
 The port was first committed to the NetBSD source tree as NetBSD/x86_64
 on June 19th, 2001 and renamed to NetBSD/amd64 on April 26th, 2003.
@@ -26,7 +26,7 @@
 <a class="ulink" href="http://developer.amd.com/" target="_top">AMD Developer Center</a>.
 
 The port is fully functional. It has been tested on single-CPU and
-multiprocessor (SMP) Opteron configurations. Since the <a class="ulink" href="../../releases/formal-2.0/NetBSD-2.0.html" target="_top">release of NetBSD 2.0</a>,
+multiprocessor (SMP) Opteron configurations. Since the <a class="ulink" href="http://www.NetBSD.org/releases/formal-2.0/NetBSD-2.0.html" target="_top">release of NetBSD 2.0</a>,
 it is a completely supported platform.
 """
 

NetBSD/arm32 has been gone for 14 years.
Index: wikisrc/ports/acorn26.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn26.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/acorn26.mdwn	18 Apr 2015 14:31:38 -0000	1.6
+++ wikisrc/ports/acorn26.mdwn	19 May 2015 20:45:45 -0000	1.7
@@ -9,7 +9,7 @@
 about="""
 NetBSD/acorn26 is the port of NetBSD to ARMv2 and ARMv2a machines, primarily the
 Acorn Archimedes, A-series and R-series systems. These systems pre-date those
-supported by NetBSD/arm32 and use an earlier, incompatible version of the ARM
+supported by NetBSD/acorn32 and use an earlier, incompatible version of the ARM
 architecture.
 """
 supported_hardware="""

talk about old stuff in the past tense, and use 'file system' instead of
'filing system'
Index: wikisrc/ports/acorn32.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn32.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/ports/acorn32.mdwn	6 Oct 2014 21:41:28 -0000	1.8
+++ wikisrc/ports/acorn32.mdwn	19 May 2015 20:43:44 -0000	1.9
@@ -10,7 +10,7 @@
 NetBSD/acorn32 is a port to ARM- and StrongARM-powered Acorn RiscPC compatible
 machines and is maintained by Reinoud Zandijk
 [(reinoud)](mailto:reinoud@NetBSD.org).  The first formal release of
-NetBSD/acorn32 is 1.6. In earlier releases of NetBSD, these machines are
+NetBSD/acorn32 was 1.6. In earlier releases of NetBSD, these machines were
 supported by NetBSD/arm32.
 
 The port first saw light as RiscBSD in 1994 and was later transformed into
@@ -44,7 +44,7 @@
 
 Support for Acorn platforms was written by Mark Brinicombe (most of it) with
 help from Scott Stevens (various device drivers), Melvin Tang Richardson (VIDC
-console), Mike Pumford (EtherH driver) and Andrew McMurry (Acorn FileCore filing
+console), Mike Pumford (EtherH driver) and Andrew McMurry (Acorn FileCore file
 system).
 
 ###Ongoing Work

note that i386 packages built on 6.0 are available
Index: wikisrc/ports/i386.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/i386.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/i386.mdwn	16 May 2015 16:25:29 -0000	1.7
+++ wikisrc/ports/i386.mdwn	19 May 2015 18:39:16 -0000	1.8
@@ -2,6 +2,7 @@
 port="i386"
 cur_rel="6.1.5"  
 future_rel="7.0"
+pkg_rel="6.0"
 changes_cur="6.0"
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/i386/header.gif"

note that amd64 packages built on 6.0 are available
Index: wikisrc/ports/amd64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/amd64.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/ports/amd64.mdwn	24 Dec 2014 05:28:50 -0000	1.12
+++ wikisrc/ports/amd64.mdwn	19 May 2015 18:38:16 -0000	1.13
@@ -2,6 +2,7 @@
 port="amd64"
 cur_rel="6.1.5"
 future_rel="7.0"
+pkg_rel="6.0"
 changes_cur="6.0"
 changes_future="7.0"
 thumbnail="http://www.netbsd.org/images/ports/amd64/AMD_Opteron.gif"

fix typo: pre-buil_t_ binary packages, not pre-build
Index: wikisrc/templates/port.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/templates/port.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/templates/port.mdwn	18 Jan 2014 00:11:19 -0000	1.11
+++ wikisrc/templates/port.mdwn	19 May 2015 18:34:59 -0000	1.12
@@ -11,9 +11,9 @@
 * [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>-<TMPL_VAR port_var2>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> FTP")
 <TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> via FTP](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/ "NetBSD/<TMPL_VAR port> FTP")
 * [NetBSD/<TMPL_VAR port> <TMPL_VAR cur_rel> INSTALL notes](http://ftp.NetBSD.org/pub/NetBSD/NetBSD-<TMPL_VAR cur_rel>/<TMPL_VAR port>/INSTALL.html "NetBSD/<TMPL_VAR port> INSTALL notes")</TMPL_IF></TMPL_IF>
-<TMPL_IF pkg_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR pkg_rel> pre-build binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var1>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> pkgsrc binary packages")
-* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR pkg_rel> pre-build binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var2>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> pkgsrc binary packages")
-<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR pkg_rel> pre-build binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port> pkgsrc binary packages")</TMPL_IF></TMPL_IF>
+<TMPL_IF pkg_rel><TMPL_IF port_var1>* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var1> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var1>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> pkgsrc binary packages")
+* [NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port_var2>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port>-<TMPL_VAR port_var2> pkgsrc binary packages")
+<TMPL_ELSE>* [NetBSD/<TMPL_VAR port> <TMPL_VAR pkg_rel> pre-built binary packages from pkgsrc](http://ftp.NetBSD.org/pub/pkgsrc/packages/NetBSD/<TMPL_VAR port>/<TMPL_VAR pkg_rel>/ "NetBSD/<TMPL_VAR port> pkgsrc binary packages")</TMPL_IF></TMPL_IF>
 <TMPL_IF changes_cur>* [NetBSD/<TMPL_VAR port> <TMPL_VAR changes_cur> changes](http://www.NetBSD.org/changes/changes-<TMPL_VAR changes_cur>.html#port-<TMPL_VAR port> "NetBSD/<TMPL_VAR port> <TMPL_VAR changes_cur> changes")</TMPL_IF>
 * [NetBSD/<TMPL_VAR port> <TMPL_VAR changes_future> changes](http://www.NetBSD.org/changes/changes-<TMPL_VAR changes_future>.html#port-<TMPL_VAR port> "NetBSD/<TMPL_VAR port> <TMPL_VAR changes_future> changes")
 

fix another wikification mistake: fix broken link to mipsco port page.
Index: wikisrc/ports/arc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/arc.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/arc.mdwn	19 May 2015 18:23:58 -0000	1.6
+++ wikisrc/ports/arc.mdwn	19 May 2015 18:29:37 -0000	1.7
@@ -16,7 +16,7 @@
 This port originally started as NetBSD/pica port made by Per Fogelstr&ouml;m,
 and supersedes it. This port is also based on efforts done in [OpenBSD/arc](http://www.openbsd.org/arc.html).
 
-Earlier pre-ARC MIPS machines are supported by the [NetBSD/mipsco](ports/mipsco) port.
+Earlier pre-ARC MIPS machines are supported by the [NetBSD/mipsco](../mipsco/) port.
 
 The portmaster is collecting detailed information on as many ARC implementation
 variations as possible. An explanation of how to get internal details

fix an error made in the wikification of this port page: lowercase
oumlaut in "Fogelstroem", not uppercase.
Index: wikisrc/ports/arc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/arc.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/arc.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/arc.mdwn	19 May 2015 18:23:58 -0000	1.6
@@ -13,7 +13,7 @@
 put together by the Advanced Computing Environment (ACE) Consortium in the early
 1990's, as an alternative to Intel-based PC's. 
 
-This port originally started as NetBSD/pica port made by Per Fogelstr&Ouml;m,
+This port originally started as NetBSD/pica port made by Per Fogelstr&ouml;m,
 and supersedes it. This port is also based on efforts done in [OpenBSD/arc](http://www.openbsd.org/arc.html).
 
 Earlier pre-ARC MIPS machines are supported by the [NetBSD/mipsco](ports/mipsco) port.

Add watchdog timer to TODO list
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/ports/evbarm/tegra.mdwn	13 May 2015 11:09:31 -0000	1.8
+++ wikisrc/ports/evbarm/tegra.mdwn	18 May 2015 12:08:24 -0000	1.9
@@ -38,6 +38,7 @@
  - Audio codec
  - AS3722 power management unit
  - [[!template id=man name="ahcisata" section="4"]] (for SATA support)
+ - Watchdog timer
 
 # Generating a boot script
 

fix yet another broken link to a sub-port-page that doesn't exist on the
wiki.
Index: wikisrc/ports/evbppc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbppc.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/evbppc.mdwn	16 May 2015 16:34:00 -0000	1.7
+++ wikisrc/ports/evbppc.mdwn	16 May 2015 16:36:09 -0000	1.8
@@ -35,7 +35,7 @@
 """
 
 additional="""
-  * [PM/PPC FAQ](pmppcfaq.html)
+  * [PM/PPC FAQ](http://www.NetBSD.org/ports/evbppc/pmppcfaq.html)
   * [NetBSD Diskless HOWTO](../../docs/network/netboot/)
   * [PowerPC documents](../../docs/Hardware/Chips/Motorola/) in the [Hardware Documentation page](../../docs/Hardware/)
 """

(potentially) make those sublists actually work.
Index: wikisrc/ports/evbppc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbppc.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/evbppc.mdwn	16 May 2015 16:31:27 -0000	1.6
+++ wikisrc/ports/evbppc.mdwn	16 May 2015 16:34:00 -0000	1.7
@@ -13,12 +13,14 @@
 ### Artesyn's PM/PPC board
 
 The following devices are supported:
+
  * Network
  * Serial ports
  * PCI bridge
  * Real time clock
 
 The following devices are not yet supported:
+
   * Flash
   * IIC
   * ROM

potentially fix a formatting goof made during the wiki transition that
resulted in the list of supported boards showing up under the
_un_supported hardware list.
as an aside, the list of boards is incomplete. fixing that is a job for
someone who isn't me.
Members: 
	ports/evbppc.mdwn:1.5->1.6 

Index: wikisrc/ports/evbppc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbppc.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/evbppc.mdwn	6 Oct 2014 21:41:28 -0000	1.5
+++ wikisrc/ports/evbppc.mdwn	16 May 2015 16:31:27 -0000	1.6
@@ -10,21 +10,28 @@
 evaluation boards and appliances.
 """
 supported_hardware="""
+### Artesyn's PM/PPC board
+
+The following devices are supported:
  * Network
  * Serial ports
  * PCI bridge
  * Real time clock
-"""
-unsupported_hardware="""
+
+The following devices are not yet supported:
   * Flash
   * IIC
   * ROM
-<br /><br />
-  * IBM PowerPC 405GP based Walnut evaluation board
-  * Marvell PowerPC 750 based [EV-64260](http://www.lynuxworks.com/board-support/marvell/ev-64260a.php) evaluation board 
-  * NCD [Explora451](http://www.ncd.com/support/explora/400/) NC 
-  * Plat'Home [OpenBlockS266](http://www.plathome.co.jp/products/openblocks/openblocks266/) microserver 
+
+### IBM PowerPC 405GP based Walnut evaluation board
+
+### Marvell PowerPC 750 based [EV-64260](http://www.lynuxworks.com/board-support/marvell/ev-64260a.php) evaluation board 
+
+### NCD [Explora451](http://www.ncd.com/support/explora/400/) NC 
+
+### Plat'Home [OpenBlockS266](http://www.plathome.co.jp/products/openblocks/openblocks266/) microserver 
 """
+
 additional="""
   * [PM/PPC FAQ](pmppcfaq.html)
   * [NetBSD Diskless HOWTO](../../docs/network/netboot/)

remove some bogus and/or outdated and/or useless content.
Index: wikisrc/ports/i386.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/i386.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/i386.mdwn	6 Oct 2014 21:41:29 -0000	1.6
+++ wikisrc/ports/i386.mdwn	16 May 2015 16:25:29 -0000	1.7
@@ -8,41 +8,10 @@
 about="""
 NetBSD/i386 is the port of NetBSD to generic machines ("PC clones") with 32-bit x86-family processors. It runs on PCI-Express, PCI, and CardBus systems, as well as older hardware with PCMCIA, VL-bus, EISA, MCA, and ISA (AT-bus) interfaces, with or without math coprocessors.
 
-NetBSD/i386 was the original port of NetBSD, and was initially released as [NetBSD 0.8](http://www.netbsd.org/releases/formal-0.8/) in 1993.
-
-Frank van der Linden is the current port maintainer of NetBSD/i386.
-
-"""
-supported_hardware="""
-The minimal configuration for a NetBSD/i386 system requires 4M of RAM and about 40M of disk space.
-
-For a full installation (including source and X11), at least 8M of RAM and 200M of disk space are recommended.
-
 Any i486 or better CPU should work - genuine Intel or a compatible such as Cyrix, AMD, or NexGen.
 
-Devices (driver names in parenthesis) supported by NetBSD/i386 include:
+NetBSD/i386 was the original port of NetBSD, and was initially released as [NetBSD 0.8](http://www.netbsd.org/releases/formal-0.8/) in 1993.
 
- * Machine-independent drivers for ISA devices
- * Machine-independent drivers for PCI devices
- * Machine-independent drivers for EISA devices
- * Machine-independent drivers for PCMCIA devices
- * Machine-independent drivers for Cardbus devices
- * Machine-independent drivers for ATA devices
- * Machine-independent drivers for SCSI and ATAPI devices.
- * Machine-independent drivers for USB devices
- * Machine-independent drivers for MII devices (IEEE 802.3 Media Independent Interface, typically used for physical media interfaces for FastEthernet controllers)
- * Machine-independent drivers for MCA devices
- * Standard PC floppy controllers (fdc) and drives (fd)
- * Adaptec 284x VLbus SCSI host adapters (ahc)
- * NCR 53C80 port-mapped and memory-mapped SCSI host adapters (nca)
- * The PC speaker (pcppi and sysbeep)
- * Logitech bus mouse (lms)
- * Microsoft InPort mouse (mms)
- * PS/2 mouse (pms)
- * Joysticks on game ports (joy)
- * MDA, CGA, VGA, SVGA and HGC Display Adapters (pccons or wscons).
-     *  not all of the display adapters supported by NetBSD/i386 will work with X. See the XFree86 FAQ for more information.
 """
-
 ]]
 [[!tag tier1port]]

"an Fujitsu" -> "a Fujitsu"
Index: wikisrc/ports/sparc64.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/sparc64.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/ports/sparc64.mdwn	16 Apr 2015 21:22:06 -0000	1.9
+++ wikisrc/ports/sparc64.mdwn	15 May 2015 05:38:22 -0000	1.10
@@ -74,7 +74,7 @@
 unsupported_hardware="""
 * Systems with an UltraSPARC IV CPU (unknown; may work)
 * Systems with an UltraSPARC T1-T5 CPU (in-progress)
-* Systems with an Fujitsu SPARC64 CPU (in-progress)
+* Systems with a Fujitsu SPARC64 CPU (in-progress)
 * Smart card readers 
 """
 additional="""

CPU frequency scaling is supported now
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 21:03:14 -0000	1.7
+++ wikisrc/ports/evbarm/tegra.mdwn	13 May 2015 11:09:31 -0000	1.8
@@ -7,7 +7,8 @@
 
 # Supported hardware
  - CPU: Cortex-A15: NVIDIA Tegra K1 (T124) (4-core)
- - VFP / NEON
+   - VFP / NEON
+   - CPU frequency scaling
  - GIC
  - ARM generic timer
  - Clock and reset controller
@@ -28,7 +29,6 @@
 
 # TODO
  - SMP stability
- - CPU frequency scaling
  - eMMC support
  - SD/MMC UHS-I support (needs [[!template id=man name="sdmmc" section="4"]] changes)
  - Framebuffer console

TMP451 is supported now
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:54:50 -0000	1.6
+++ wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 21:03:14 -0000	1.7
@@ -24,6 +24,7 @@
  - Jetson TK1
    - On-board Realtek 8111G [[!template id=man name="re" section="4"]] gigabit ethernet 
    - EEPROM [[!template id=man name="seeprom" section="4"]] (on I2C)
+   - TMP451 [[!template id=man name="titemp" section="4"]] temperature sensor (on I2C)
 
 # TODO
  - SMP stability
@@ -35,7 +36,6 @@
  - [[!template id=man name="hdaudio" section="4"]] (for HDMI audio)
  - I2S
  - Audio codec
- - TMP451 temperature sensor
  - AS3722 power management unit
  - [[!template id=man name="ahcisata" section="4"]] (for SATA support)
 

xref sdhc
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:54:21 -0000	1.5
+++ wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:54:50 -0000	1.6
@@ -18,7 +18,7 @@
  - I2C controller
  - UART [[!template id=man name="com" section="4"]] serial console
  - RTC
- - SDMMC controller
+ - SDMMC [[!template id=man name="sdhc" section="4"]] controller
  - USB 2.0 [[!template id=man name="ehci" section="4"]] controller
  - PCI express
  - Jetson TK1

xref sdmmc
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:53:01 -0000	1.4
+++ wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:54:21 -0000	1.5
@@ -29,7 +29,7 @@
  - SMP stability
  - CPU frequency scaling
  - eMMC support
- - SD/MMC UHS-I support (needs sdmmc(4) changes)
+ - SD/MMC UHS-I support (needs [[!template id=man name="sdmmc" section="4"]] changes)
  - Framebuffer console
  - HDMI
  - [[!template id=man name="hdaudio" section="4"]] (for HDMI audio)

Add supported hardware list, TODO
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:38:12 -0000	1.3
+++ wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:53:01 -0000	1.4
@@ -2,6 +2,43 @@
 
 **The Tegra port is work in progress**
 
+[[!toc levels=2]]
+
+
+# Supported hardware
+ - CPU: Cortex-A15: NVIDIA Tegra K1 (T124) (4-core)
+ - VFP / NEON
+ - GIC
+ - ARM generic timer
+ - Clock and reset controller
+ - GPIO controller
+ - MPIO / pinmux controller
+ - Memory controller
+ - Power management controller
+ - I2C controller
+ - UART [[!template id=man name="com" section="4"]] serial console
+ - RTC
+ - SDMMC controller
+ - USB 2.0 [[!template id=man name="ehci" section="4"]] controller
+ - PCI express
+ - Jetson TK1
+   - On-board Realtek 8111G [[!template id=man name="re" section="4"]] gigabit ethernet 
+   - EEPROM [[!template id=man name="seeprom" section="4"]] (on I2C)
+
+# TODO
+ - SMP stability
+ - CPU frequency scaling
+ - eMMC support
+ - SD/MMC UHS-I support (needs sdmmc(4) changes)
+ - Framebuffer console
+ - HDMI
+ - [[!template id=man name="hdaudio" section="4"]] (for HDMI audio)
+ - I2S
+ - Audio codec
+ - TMP451 temperature sensor
+ - AS3722 power management unit
+ - [[!template id=man name="ahcisata" section="4"]] (for SATA support)
+
 # Generating a boot script
 
 [[!template  id=programlisting text="""

add bootargs to boot.scr
Index: wikisrc/ports/evbarm/tegra.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/evbarm/tegra.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/ports/evbarm/tegra.mdwn	11 Apr 2015 17:22:18 -0000	1.2
+++ wikisrc/ports/evbarm/tegra.mdwn	12 May 2015 10:38:12 -0000	1.3
@@ -6,6 +6,7 @@
 
 [[!template  id=programlisting text="""
 $ cat boot.txt
+setenv bootargs root=ld1a
 fatload mmc 1:1 0x90000000 netbsd.ub
 bootm 0x90000000
 $ mkubootimage -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/tegra boot" boot.txt boot.scr

Add a comment