diff --git a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml b/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
index 8c142e6a27..fbb7988c71 100644
--- a/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/geom/chapter.sgml
@@ -430,9 +430,9 @@ OK? <userinput>boot</userinput></screen>
     <para>Now to <command>mount</command> the device on the client
       machine, issue the following commands:</para>
 
-    <screen>&prompt.root; <userinput>ggatec create -o rw 192.168.1.1 /dev/da0s4d</userinput></screen>
-    <screen>ggate0</screen>
-    <screen>&prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
+    <screen>&prompt.root; <userinput>ggatec create -o rw 192.168.1.1 /dev/da0s4d</userinput>
+ggate0
+&prompt.root; <userinput>mount /dev/ggate0 /mnt</userinput></screen>
 
     <para>From here on, the device may be accessed through the
       <filename role="directory">/mnt</filename> mount point.</para>
@@ -510,15 +510,15 @@ OK? <userinput>boot</userinput></screen>
 	the auto detection associated with permanent labels, and the
 	fact that this type of label will be persistent across reboots.
 	These labels are given a special directory in
-	<filename role="directory">/dev</filename>, which will be named
+	<filename class="directory">/dev</filename>, which will be named
 	based on their file system type.  For example,
 	<acronym>UFS</acronym>2 file system labels will be created in
-	the <filename role="directory">/dev/ufs2</filename>
+	the <filename class="directory">/dev/ufs2</filename>
 	directory.</para>
 
       <para>A generic label will go away with the next reboot. These
 	labels will be created in the
-	<filename role="directory">/dev/label</filename> directory and
+	<filename class="directory">/dev/label</filename> directory and
 	are perfect for experimentation.</para>
 
 <!-- XXXTR: How do you create a file system label without running newfs
@@ -528,9 +528,9 @@ OK? <userinput>boot</userinput></screen>
 	<command>tunefs</command> or <command>newfs</command>
 	utilities.  To create a permanent label for a
 	<acronym>UFS</acronym>2 file system without destroying any
-	data, issue the following commands:</para>
+	data, issue the following command:</para>
 
-      <screen>&prompt.root; <userinput>tunefs -L home /dev/da3</userinput></screen>
+      <screen>&prompt.root; <userinput>tunefs -L <replaceable>home</replaceable> <replaceable>/dev/da3</replaceable></userinput></screen>
 
       <warning>
 	<para>If the file system is full, this may cause data
@@ -540,7 +540,7 @@ OK? <userinput>boot</userinput></screen>
       </warning>
 
       <para>A label should now exist in
-	<filename role="directory">/dev/ufs2</filename> which may be
+	<filename class="directory">/dev/ufs2</filename> which may be
 	added to <filename>/etc/fstab</filename>:</para>
 
       <programlisting>/dev/ufs2/home		/home            ufs     rw              2      2</programlisting>
@@ -562,7 +562,7 @@ OK? <userinput>boot</userinput></screen>
       <para>From this point on, so long as the
 	<filename>geom_label.ko</filename> kernel module is loaded at
 	boot with <filename>/boot/loader.conf</filename> or the
-	<devicename>GEOM_LABEL</devicename> kernel option is present,
+	<literal>GEOM_LABEL</literal> kernel option is present,
 	the device node may change without any ill effect on the
 	system.</para>