--- wikisrc/ports/xen/howto.mdwn	2018/07/26 11:16:22	1.151
+++ wikisrc/ports/xen/howto.mdwn	2018/07/26 11:44:17	1.152
@@ -253,11 +253,6 @@ documentation](https://www.NetBSD.org/do
 pkgsrc.  Ensure that your packages are recent; the HOWTO does not
 contemplate old builds.
 
-
-For Xen 3.1, support for HVM guests is in sysutils/xentool3-hvm.  More
-recent versions have HVM support integrated in the main xentools
-package.  It is entirely reasonable to run only PV guests.
-
 Next you need to install the selected Xen kernel itself, which is
 installed by pkgsrc as "/usr/pkg/xen*-kernel/xen.gz".  Copy it to /.
 For debugging, one may copy xen-debug.gz; this is conceptually similar
@@ -279,15 +274,19 @@ with an MBR bootblock, either bootxx_ffs
 beginning of your root file system, have /boot, and likely also
 /boot.cfg.  (If not, fix before continuing!)
 
-Add a line to to /boot.cfg to boot Xen.  See boot.cfg(5) for an
-example.  The basic line is
+Add a line to /boot.cfg to boot Xen.  See boot.cfg(5) for an
+example.  The basic line is:
 
-        menu=Xen:load /netbsd-XEN3_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
+[[!template id=programlisting text="""
+menu=Xen:load /netbsd-XEN3_DOM0.gz console=pc;multiboot /xen.gz dom0_mem=512M
+"""]]
 
 which specifies that the dom0 should have 512M, leaving the rest to be
 allocated for domUs.  To use a serial console, use
 
-        menu=Xen:load /netbsd-XEN3_DOM0.gz;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
+[[!template id=programlisting text="""
+menu=Xen:load /netbsd-XEN3_DOM0.gz;multiboot /xen.gz dom0_mem=512M console=com1 com1=9600,8n1
+"""]]
 
 which will use the first serial port for Xen (which counts starting
 from 1, unlike NetBSD which counts starting from 0), forcing
@@ -296,9 +295,11 @@ speed/parity.  Because the NetBSD comman
 which directs the console I/O through Xen to the same console device Xen
 itself uses (in this case, the serial port).
 
-In an attempt to add performance, one can also add
+In an attempt to add performance, one can also add:
 
-        dom0_max_vcpus=1 dom0_vcpus_pin
+[[!template id=programlisting text="""
+dom0_max_vcpus=1 dom0_vcpus_pin
+"""]]
 
 to force only one vcpu to be provided (since NetBSD dom0 can't use
 more) and to pin that vcpu to a physical CPU.  TODO: benchmark this.
@@ -346,22 +347,18 @@ There will be no domUs, and none can be 
 to configure the dom0 daemons.
 
 The daemons which should be run vary with Xen version and with whether
-one is using xm or xl.  The Xen 3.1, 3.3 and 4.1 packages use xm.  Xen
-4.2 and up packages use xl.  To use xm with 4.2, edit xendomains to
-use xm instead.
-
-For 3.1 and 3.3, you should enable xend and xenbackendd:
-
-        xend=YES
-        xenbackendd=YES
+one is using xm or xl. Xen 4.2 and up packages use xl. To use xm with 4.2,
+edit xendomains to use xm instead.
 
 For 4.1 and up, you should enable xencommons.  Not enabling xencommons
 will result in a hang; it is necessary to hit ^C on the console to let
 the machine finish booting.  If you are using xm (default in 4.1, or
 if you changed xendomains in 4.2), you should also enable xend:
 
-        xend=YES # only if using xm, and only installed <= 4.2
-        xencommons=YES
+[[!template id=programlisting text="""
+xend=YES # only if using xm, and only installed <= 4.2
+xencommons=YES
+"""]]
 
 TODO: Recommend for/against xen-watchdog.