===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/Attic/vax-simh.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- www/Attic/vax-simh.html	2015/07/02 05:49:04	1.31
+++ www/Attic/vax-simh.html	2015/11/16 23:58:23	1.32
@@ -19,7 +19,7 @@
 It is very easy to install OpenBSD/vax on the
 <a href="http://simh.trailing-edge.com">SIMH</a> VAX simulator.  All
 you need is a reasonably fast machine, enough disk space for a 1.5GB
-disk image and the vax <i>floppy53.fs</i> file.
+disk image and a <i>floppyXX.fs</i> file from the OpenBSD/VAX distribution.
 
 Assuming you're going to run SIMH on an OpenBSD system, install the
 <i>emulators/simh</i> package from <a href="faq/ports/index.html">ports</a>.
@@ -42,7 +42,7 @@
 at rq1 /dev/rcd0c
 
 set rq2 cdrom
-at rq2 floppy53.fs
+at rq2 floppy58.fs
 
 at xq0 tap:tun0
 
@@ -52,6 +52,8 @@
 </pre>
 </blockquote>
 
+For OpenBSD >5.8, replace "at xq0 tap:tun0" with "at xq0 tap:tap0".<p>
+
 This configures SIMH to simulate a VAX with a whopping 128 MB of
 memory, a RA92 1.5GB disk, a CD-ROM unit to hold CD1 of your CD-ROM
 set, another CD-ROM unit to boot from, and a DELQA Qbus Ethernet
@@ -78,13 +80,19 @@
 
 <p>
 
-Create the tun0 network interface, set it into layer 2 mode and bring it up:
+Create the network interface, set it into layer 2 mode if necessary,
+and bring it up:
 
 <blockquote>
 <pre>
+# OpenBSD &lt;=5.8
 # <strong>ifconfig tun0 create</strong>
 # <strong>ifconfig tun0 link0</strong>
 # <strong>ifconfig tun0 up</strong>
+
+# OpenBSD >5.8
+# <strong>ifconfig tap0 create</strong>
+# <strong>ifconfig tap0 up</strong>
 </pre>
 </blockquote>
 
@@ -92,23 +100,31 @@
 
 <blockquote>
 <pre>
+# OpenBSD &lt;=5.8
 # <strong>ifconfig bridge0 create</strong>
 # <strong>ifconfig bridge0 fwddelay 4</strong>
 # <strong>ifconfig bridge0 add em0 add tun0</strong>
 # <strong>ifconfig bridge0 up</strong>
+
+# OpenBSD >5.8
+# <strong>ifconfig bridge0 create</strong>
+# <strong>ifconfig bridge0 fwddelay 4</strong>
+# <strong>ifconfig bridge0 add em0 add tap0</strong>
+# <strong>ifconfig bridge0 up</strong>
 </pre>
 </blockquote>
 
-By setting appropriate permissions on /dev/tun0 you can avoid running
-SIMH as root.
+By setting appropriate permissions on /dev/tun0 or /dev/tap0 you can
+avoid running SIMH as root.
 
 <p>
 
-Alternatively, if you cannot use bridge(4) (for example with some
-wireless drivers), you can use BPF to connect to the network.
-In this case, you can skip the above <tt>ifconfig</tt> lines and
-replace the "<tt>at xq0 tap:tun0</tt>" line with a line like this,
-replacing iwn0 with your actual network interface as necessary:
+802.11 wireless interfaces cannot use bridge(4) without WDS support;
+in this case you can use BPF to connect to the network.
+Skip the above <tt>ifconfig</tt> lines and replace the
+"<tt>at xq0 tap:tun0</tt>" or "<tt>at xq0 tap:tap0</tt>" line with
+a line like this, replacing iwn0 with your actual network interface
+as necessary:
 
 <blockquote><pre>
 <strong>at xq0 iwn0</strong>
@@ -116,7 +132,7 @@
 
 <p>
 
-Copy <i>vax/floppy53.fs</i> to the location of your
+Copy the relevant <i>vax/floppyXX.fs</i> file to the location of your
 OpenBSD/vax SIMH environment.
 
 Now fire up SIMH.  At the boot prompt you should type <strong>boot
@@ -178,7 +194,7 @@
 
 When you are done installing any additional packages, you might want
 to remove the lines referring to your real CD-ROM unit and
-<i>floppy53.fs</i> from your <i>openbsd.simh</i> file.
+<i>floppyXX.fs</i> from your <i>openbsd.simh</i> file.
 
 <p>