diff --git a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
index ed6eb9cd70..5847b65a1b 100644
--- a/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/boot/chapter.sgml
@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.16 2001/07/24 22:37:20 chern Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.17 2001/08/01 21:39:52 nik Exp $
 -->
 
 <chapter id="boot">
@@ -148,7 +148,7 @@ Default: F2</screen>
 	or you want to replace your existing MBR with the FreeBSD MBR then use
 	the following command.</para>
 
-      <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></screen>
+      <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
 
       <para>Where <replaceable>device</replaceable> is the device that you
 	boot from, such as <devicename>ad0</devicename> for the first IDE
@@ -178,10 +178,9 @@ Default: F2</screen>
 	can only be 512 bytes
 	in size, and knows just enough about the FreeBSD
 	<firstterm>disklabel</firstterm>, which stores information
-	about the slice, to find and execute <link
-	  linkend="boot-boot2">boot2</link>.</para>
+	about the slice, to find and execute <filename>boot2</filename>.</para>
       
-      <para>boot2 is slightly more sophisticated, and understands
+      <para><filename>boot2</filename> is slightly more sophisticated, and understands
 	the FreeBSD filesystem enough to find files on it, and can
 	provide a simple interface to choose the kernel or loader to
 	run.</para>
@@ -204,7 +203,7 @@ boot:</screen>
 	<filename>boot1</filename> and <filename>boot2</filename> use
 	&man.disklabel.8;.</para>
       
-      <screen>&prompt.root; <userinput>disklabel -B <replaceable>diskslice</replaceable></screen>
+      <screen>&prompt.root; <userinput>disklabel -B <replaceable>diskslice</replaceable></userinput></screen>
 
       <para>Where <replaceable>diskslice</replaceable> is the disk and slice
 	you boot from, such as <devicename>ad0s1</devicename> for the first
@@ -235,7 +234,7 @@ boot:</screen>
       backed up by a more powerful interpreter, with a more complex
       command set.</para> 
 
-    <sect2 id="boot-loader-flow">
+    <sect3 id="boot-loader-flow">
       <title>Loader Program Flow</title>
       
       <para>During initialization, the loader will probe for a
@@ -264,9 +263,9 @@ boot:</screen>
 
       <para>A more technical discussion of the process is available
 	in &man.loader.8;</para>
-    </sect2>
+    </sect3>
     
-    <sect2 id="boot-loader-commands">
+    <sect3 id="boot-loader-commands">
       <title>Loader Built-In Commands</title>
       
       <para>The easy-to-use command set comprises of:</para>
@@ -405,9 +404,9 @@ boot:</screen>
 	  </listitem>
 	</varlistentry>
       </variablelist>
-    </sect2>
+    </sect3>
 
-    <sect2 id="boot-loader-examples">
+    <sect3 id="boot-loader-examples">
       <title>Loader Examples</title>
 
       <para>Here are some practical examples of loader usage.</para>
@@ -455,7 +454,8 @@ boot:</screen>
 	    <replaceable>/boot/kernel.conf</replaceable></userinput></screen>
 	</listitem>
       </itemizedlist>
-  </sect2>
+  </sect3>
+    </sect2>
   </sect1>
 
   <sect1 id="boot-kernel">
@@ -467,7 +467,7 @@ boot:</screen>
     
     <para>Once the kernel is loaded by either <link
 	linkend="boot-loader">loader</link> (as usual) or <link
-	linkend="boot-boot2">boot2</link> (bypassing the loader), it
+	linkend="boot-boot1">boot2</link> (bypassing the loader), it
       examines its boot flags, if any, and adjusts its behavior as
       necessary.</para>