diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
index b5b7987d9d..71b91a4f47 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
@@ -129,7 +129,7 @@
 	program in the <abbrev>MBR</abbrev> can only be 512 bytes in
 	size.  If you have installed the FreeBSD MBR and have installed
 	multiple operating systems on your hard disks then you will see a
-	display similar to this one at boot time.</para>
+	display similar to this one at boot time:</para>
 
       <example id="boot-boot0-example">
 	<title><filename>boot0</filename> Screenshot</title>
@@ -146,7 +146,7 @@ Default: F2</screen>
       <para>Other operating systems, in particular Windows 95, have been known
 	to overwrite an existing MBR with their own.  If this happens to you,
 	or you want to replace your existing MBR with the FreeBSD MBR then use
-	the following command.</para>
+	the following command:</para>
 
       <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
 
@@ -295,7 +295,7 @@ boot:</screen>
       
       <para>These are the most commonly used loader commands.  For a
         complete discussion of all available commands, please see
-        &man.loader.8;</para>
+        &man.loader.8;.</para>
 
       <variablelist>
 	<varlistentry>
@@ -436,7 +436,7 @@ boot:</screen>
     <sect3 id="boot-loader-examples">
       <title>Loader Examples</title>
 
-      <para>Here are some practical examples of loader usage.</para>
+      <para>Here are some practical examples of loader usage:</para>
 
       <itemizedlist>
 	<indexterm><primary>single-user mode</primary></indexterm>
@@ -569,7 +569,7 @@ boot:</screen>
     <title>Init: Process Control Initialization</title>
 	
     <para>Once the kernel has finished booting, it passes control to
-      the user process <command>init</command>, which is located at
+      the user process &man.init.8;, which is located at
       <filename>/sbin/init</filename>, or the program path specified
       in the <envar>init_path</envar> variable in
       <command>loader</command>.</para>
@@ -579,8 +579,8 @@ boot:</screen>
       
       <para>The automatic reboot sequence makes sure that the
 	filesystems available on the system are consistent.  If they
-	are not, and <command>fsck</command> cannot fix the
-	inconsistencies, <command>init</command> drops the system
+	are not, and &man.fsck.8; cannot fix the
+	inconsistencies, &man.init.8; drops the system
 	into <link linkend="boot-singleuser">single-user mode</link>
 	for the system administrator to take care of the problems
 	directly.</para>
@@ -599,7 +599,7 @@ boot:</screen>
 	<command>loader</command>.</para>
 
       <para>It can also be reached by calling
-	<command>shutdown</command> without the reboot
+	&man.shutdown.8; without the reboot
 	(<option>-r</option>) or halt (<option>-h</option>) options,
 	from <link linkend="boot-multiuser">multi-user
 	  mode</link>.</para>
@@ -610,7 +610,7 @@ boot:</screen>
 	before initiating single-user mode.</para>
 
       <example id="boot-insecure-console">
-	<title>An Insecure Console in /etc/ttys</title>
+	<title>An Insecure Console in <filename>/etc/ttys</filename></title>
 
 	<programlisting># name  getty                           type    status          comments
 #
@@ -634,7 +634,7 @@ console none                            unknown off insecure</programlisting>
       <title>Multi-User Mode</title>
       <indexterm><primary>multi-user mode</primary></indexterm>
       
-      <para>If <command>init</command> finds your filesystems to be
+      <para>If &man.init.8; finds your filesystems to be
 	in order, or once the user has finished in <link
 	  linkend="boot-singleuser">single-user mode</link>, the
 	system enters multi-user mode, in which it starts the
@@ -668,8 +668,8 @@ console none                            unknown off insecure</programlisting>
       <primary><command>shutdown</command></primary>
     </indexterm>
 
-    <para>Upon controlled shutdown, via <command>shutdown</command>,
-      <command>init</command> will attempt to run the script
+    <para>Upon controlled shutdown, via &man.shutdown.8;,
+      &man.init.8; will attempt to run the script
       <filename>/etc/rc.shutdown</filename>, and then proceed to send
       all processes the <literal>TERM</literal> signal, and subsequently 
       the <literal>KILL</literal> signal to any that do not terminate