--- wikisrc/ports/xen/howto.mdwn	2015/03/05 13:38:10	1.94
+++ wikisrc/ports/xen/howto.mdwn	2015/03/05 14:04:55	1.95
@@ -761,7 +761,7 @@ i386 and amd64 provide the following ker
 
         i386 XEN3_DOMU
         i386 XEN3PAE_DOMU
-	amd64 XEN3_DOMU
+        amd64 XEN3_DOMU
 
 Unless using Xen 3.1 (and you shouldn't) with i386-mode Xen, you must
 use the PAE version of the i386 kernel.
@@ -822,8 +822,6 @@ not really a Xen-specific issue, but bec
 obtained from the dom0, it is far more likely to be out of sync or
 missing with Xen.)
 
-Your domain should be now ready to work, enjoy.
-
 Creating an unprivileged Linux domain (domU)
 --------------------------------------------
 
@@ -1010,7 +1008,7 @@ to update the special boot partiion.
 Amazon
 ------
 
-TODO: add link to NetBSD amazon howto.
+See the [Amazon EC2 page](../amazon_ec2/).
 
 Using npf
 ---------
@@ -1018,9 +1016,10 @@ Using npf
 In standard kernels, npf is a module, and thus cannot be loaded in a
 DOMU kernel.
 
-TODO: explain how to compile npf into a custom kernel, answering (but
-note that the problem was caused by not booting the right kernel):
-http://mail-index.netbsd.org/netbsd-users/2014/12/26/msg015576.html
+TODO: Explain how to compile npf into a custom kernel, answering (but
+note that the problem was caused by not booting the right kernel)
+[this email to
+netbsd-users](http://mail-index.netbsd.org/netbsd-users/2014/12/26/msg015576.html).
 
 TODO items for improving NetBSD/xen
 ===================================
@@ -1049,6 +1048,5 @@ Random pointers
 TODO: This section contains links from elsewhere not yet integrated
 into the HOWTO.
 
-* [Amazon EC2 (which uses Xen)](../amazon_ec2/).
 * http://www.lumbercartel.ca/library/xen/
 * http://pbraun.nethence.com/doc/sysutils/xen_netbsd_dom0.html