diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
index fd1ee59976..17477397c9 100644
--- a/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/disks/chapter.sgml
@@ -1275,8 +1275,7 @@ scsibus1:
 
 	  <screen>&prompt.root; <userinput>dd if=/dev/acd0t01 of=track1.cdr bs=2352</userinput>
 &prompt.root; <userinput>dd if=/dev/acd0t02 of=track2.cdr bs=2352</userinput>
-...
-</screen>
+...</screen>
 	</step>
 
 	<step>
@@ -2780,7 +2779,7 @@ sa0(ncr1:4:0):  Logical unit is in process of becoming ready</screen>
 	backup, files that are created/deleted during the backup and
 	more.   She presented the results at LISA V in Oct. 1991.  See
 	<ulink
-	  url="http://www.coredumps.de/doc/dump/zwicky/testdump.doc.html ">torture-testing
+	  url="http://www.coredumps.de/doc/dump/zwicky/testdump.doc.html">torture-testing
 	  Backup and Archive Programs</ulink>.</para>
     </sect2>
 
@@ -3612,17 +3611,15 @@ Password:</screen>
 	      use with UFS1 or UFS2, set the sector_size to
 	      2048:</para>
 
-	    <programlisting>$<!-- This is not the space you are looking
-for-->FreeBSD: src/sbin/gbde/template.txt,v 1.1 2002/10/20 11:16:13 phk Exp $
+	    <programlisting># &dollar;FreeBSD: src/sbin/gbde/template.txt,v 1.1.36.1 2009/08/03 08:13:06 kensmith Exp $
 #
 # Sector size is the smallest unit of data which can be read or written.
 # Making it too small decreases performance and decreases available space.
 # Making it too large may prevent filesystems from working.  512 is the
 # minimum and always safe.  For UFS, use the fragment size
 #
-sector_size     =       2048
-[...]
-</programlisting>
+sector_size	=	2048
+[...]</programlisting>
 
 	    <para>&man.gbde.8; will ask you twice to type the
 	      passphrase that should be used to secure the data.  The
@@ -4121,10 +4118,8 @@ geli_da2_flags="-p -k /root/da2.key"</programlisting>
 	device in the respective <filename>/etc/fstab</filename> swap
 	line:</para>
 
-      <programlisting>
-# Device                Mountpoint      FStype  Options         Dump    Pass#
-/dev/ad0s1b.bde         none            swap    sw              0       0
-      </programlisting>
+      <programlisting># Device		Mountpoint	FStype	Options		Dump	Pass#
+/dev/ad0s1b.bde		none		swap	sw		0	0</programlisting>
     </sect2>
 
     <sect2>
@@ -4136,10 +4131,8 @@ geli_da2_flags="-p -k /root/da2.key"</programlisting>
 	in the respective <filename>/etc/fstab</filename> swap
 	line:</para>
 
-      <programlisting>
-# Device                Mountpoint      FStype  Options         Dump    Pass#
-/dev/ad0s1b.eli         none            swap    sw              0       0
-      </programlisting>
+      <programlisting># Device		Mountpoint	FStype	Options		Dump	Pass#
+/dev/ad0s1b.eli		none		swap	sw		0	0</programlisting>
 
       <para>&man.geli.8; uses the <acronym>AES</acronym> algorithm
 	with a key length of 256 bit by default.</para>
@@ -4170,15 +4163,13 @@ geli_da2_flags="-p -k /root/da2.key"</programlisting>
 
       <screen>&prompt.user; <userinput>swapinfo</userinput>
 Device          1K-blocks     Used    Avail Capacity
-/dev/ad0s1b.bde    542720        0   542720     0%
-      </screen>
+/dev/ad0s1b.bde    542720        0   542720     0%</screen>
 
       <para>If &man.geli.8; is being used:</para>
 
       <screen>&prompt.user; <userinput>swapinfo</userinput>
 Device          1K-blocks     Used    Avail Capacity
-/dev/ad0s1b.eli    542720        0   542720     0%
-      </screen>
+/dev/ad0s1b.eli    542720        0   542720     0%</screen>
     </sect2>
   </sect1>