diff --git a/en_US.ISO8859-1/books/handbook/install/chapter.xml b/en_US.ISO8859-1/books/handbook/install/chapter.xml
index b4465c7ed1..2ea4b0fed6 100644
--- a/en_US.ISO8859-1/books/handbook/install/chapter.xml
+++ b/en_US.ISO8859-1/books/handbook/install/chapter.xml
@@ -611,9 +611,9 @@
 	  <para>Memory stick images for
 	    &os;&nbsp;8.<replaceable>X</replaceable> can be downloaded
 	    from
-	    the <filename>ISO-IMAGES/</filename>
+	    the <filename class="directory">ISO-IMAGES/</filename>
 	    directory at
-	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/arch/ISO-IMAGES/version/&os;-version-RELEASE-arch-memstick.img</literal>.
+	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<replaceable>arch</replaceable>/ISO-IMAGES/<replaceable>version</replaceable>/&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-memstick.img</literal>.
 	    Replace <replaceable>arch</replaceable> and
 	    <replaceable>version</replaceable> with the
 	    architecture and the version number to
@@ -668,7 +668,7 @@
 		&man.dd.1; must be used to write the image directly to
 		the disk:</para>
 
-	      <screen>&prompt.root; <userinput>dd if=&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k</userinput></screen>
+	      <screen>&prompt.root; <userinput>dd if=&os;-&rel2.current;-RELEASE-&arch.i386;-memstick.img of=/dev/<replaceable>da0</replaceable> bs=64k</userinput></screen>
 
 	      <para>If an
 		<computeroutput>Operation not permitted</computeroutput>
@@ -727,12 +727,12 @@
 
 	  <para>The &os;/&arch.pc98; boot disks
 	    can be downloaded from the floppies directory,
-	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/version-RELEASE/floppies/</literal>.
+	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/<replaceable>version</replaceable>-RELEASE/floppies/</literal>.
 	    Replace <replaceable>version</replaceable> with the
 	    version number to install.</para>
 
 	  <para>The floppy images have a <filename>.flp</filename>
-	    extension.  <filename>floppies/</filename> contains a number
+	    extension.  <filename class="directory">floppies/</filename> contains a number
 	    of different images.  Download
 	    <filename>boot.flp</filename> as well as the number of
 	    files associated with the type of installation, such as
@@ -788,8 +788,8 @@
 	    <command>rawrite</command> for creating the floppies on a
 	    computer running
 	    &windows;.  This tool can be downloaded from
-	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/
-	      version-RELEASE/tools/</literal>
+	    <literal>ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/pc98/<replaceable>
+	      version</replaceable>-RELEASE/tools/</literal>
 	    on the &os; FTP site.  Download this tool, insert a
 	    floppy, then specify the filename to write to the floppy
 	    drive:</para>
@@ -1899,7 +1899,7 @@ Mounting root from ufs:/dev/md0c
 		makes the installation slightly cleaner.
 		This filesystem can be mounted anywhere; this example
 		mounts it as
-		<filename>/diskn</filename>,
+		<filename class="directory">/disk<replaceable>n</replaceable></filename>,
 		where
 		<replaceable>n</replaceable> is a number that changes for each
 		disk.</entry>
@@ -4313,7 +4313,7 @@ Please press any key to reboot.</screen>
 	      USB disk onto a &os;
 	      system using &man.mount.8;:</para>
 
-	    <screen>&prompt.root; <userinput>mount /dev/da0a /mnt</userinput></screen>
+	    <screen>&prompt.root; <userinput>mount /dev/<replaceable>da0a</replaceable> <replaceable>/mnt</replaceable></userinput></screen>
 
 	    <note>
 	      <para>Adapt the device node and the mount point to the
@@ -4325,12 +4325,12 @@ Please press any key to reboot.</screen>
 	      Add this line to <filename>/boot/loader.conf</filename>
 	      on the USB stick:</para>
 
-	    <screen>&prompt.root; <userinput>echo 'console="comconsole"' &gt;&gt; /mnt/boot/loader.conf</userinput></screen>
+	    <screen>&prompt.root; <userinput>echo 'console="comconsole"' &gt;&gt; <replaceable>/mnt</replaceable>/boot/loader.conf</userinput></screen>
 
 	    <para>Now that the USB is stick configured correctly,
 	      unmount the disk using &man.umount.8;:</para>
 
-	    <screen>&prompt.root; <userinput>umount /mnt</userinput></screen>
+	    <screen>&prompt.root; <userinput>umount <replaceable>/mnt</replaceable></userinput></screen>
 
 	    <para>Now, unplug the USB stick and jump directly
 	      to the third step of this procedure.</para>
@@ -4354,23 +4354,23 @@ Please press any key to reboot.</screen>
 	      ISO image,
 	      use &man.tar.1; to extract all the files:</para>
 
-	    <screen>&prompt.root; <userinput>mkdir /path/to/headless-iso</userinput>
-&prompt.root; <userinput>tar -C /path/to/headless-iso -pxvf &os;-&rel.current;-RELEASE-i386-disc1.iso</userinput></screen>
+	    <screen>&prompt.root; <userinput>mkdir <replaceable>/path/to/headless-iso</replaceable></userinput>
+&prompt.root; <userinput>tar -C <replaceable>/path/to/headless-iso</replaceable> -pxvf &os;-<replaceable>&rel.current;</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso</userinput></screen>
 
 	    <para>Next, set the installation media to boot into a
 	      serial console.  Add this line to the
 	      <filename>/boot/loader.conf</filename> of the extracted
 	      ISO image:</para>
 
-	    <screen>&prompt.root; <userinput>echo 'console="comconsole"' &gt;&gt; /path/to/headless-iso/boot/loader.conf</userinput></screen>
+	    <screen>&prompt.root; <userinput>echo 'console="comconsole"' &gt;&gt; <replaceable>/path/to/headless-iso</replaceable>/boot/loader.conf</userinput></screen>
 
 	    <para>Then, create a new ISO image from the modified
 	      tree.  This example uses &man.mkisofs.8; from the
 	      <package>sysutils/cdrtools</package>
 	      package or port:</para>
 
-	    <screen>&prompt.root; <userinput>mkisofs -v -b boot/cdboot -no-emul-boot -r -J -V "Headless_install" \
-	    -o Headless-&os;-&rel2.current;-RELEASE-i386-disc1.iso/path/to/headless-iso</userinput></screen>
+	    <screen>&prompt.root; <userinput>mkisofs -v -b boot/cdboot -no-emul-boot -r -J -V "<replaceable>Headless_install</replaceable>" \
+	    -o <replaceable>Headless-</replaceable>&os;-<replaceable>&rel2.current;</replaceable>-RELEASE-<replaceable>i386</replaceable>-disc1.iso<replaceable>/path/to/headless-iso</replaceable></userinput></screen>
 
 	    <para>Now that the ISO image is configured correctly,
 	      burn it to a CD/DVD media using a burning
@@ -4475,7 +4475,7 @@ Please press any key to reboot.</screen>
 	<step>
 	  <title>Download the Correct ISO Images</title>
 
-	  <para>The ISO images for each release can be downloaded from <filename>ftp://ftp.FreeBSD.org/pub/FreeBSD/ISO-IMAGES-arch/version</filename> or the closest mirror.
+	  <para>The ISO images for each release can be downloaded from <filename>ftp://ftp.FreeBSD.org/pub/FreeBSD/ISO-IMAGES-<replaceable>arch</replaceable>/<replaceable>version</replaceable></filename> or the closest mirror.
 	    or the closest mirror.  Substitute
 	    <replaceable>arch</replaceable> and
 	    <replaceable>version</replaceable> as appropriate.</para>
@@ -4498,7 +4498,7 @@ Please press any key to reboot.</screen>
 
 	      <tbody>
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-bootonly.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-bootonly.iso</filename></entry>
 
 		  <entry>This CD image starts the installation
 		    process by booting from a CD-ROM drive but it does not
@@ -4509,7 +4509,7 @@ Please press any key to reboot.</screen>
 		</row>
 
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-dvd1.iso.gz</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-dvd1.iso.gz</filename></entry>
 
 		  <entry>This DVD image contains everything necessary to
 		    install the base &os; operating system, a
@@ -4519,7 +4519,7 @@ Please press any key to reboot.</screen>
 		</row>
 
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-memstick.img</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-memstick.img</filename></entry>
 
 		  <entry>This image can be written to a USB memory stick
 		    in order to install machines capable of booting
@@ -4530,7 +4530,7 @@ Please press any key to reboot.</screen>
 		</row>
 
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-mini-memstick.img</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc1.iso</filename></entry>
 
 		  <entry>This image can be written to a USB memory
 		    stick in order to install machines capable of
@@ -4550,7 +4550,7 @@ Please press any key to reboot.</screen>
 		</row>
 
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-disc2.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc2.iso</filename></entry>
 
 		  <entry>A CD image with as many third-party packages
 		    as would fit on the disc.  This image is not
@@ -4558,7 +4558,7 @@ Please press any key to reboot.</screen>
 		</row>
 
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-disc3.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-disc3.iso</filename></entry>
 
 		  <entry>Another CD image with as many third-party
 		    packages as would fit on the disc.  This image is
@@ -4566,7 +4566,7 @@ Please press any key to reboot.</screen>
 		</row>
 
 		<row>
-		  <entry><filename>&os;-version-RELEASE-arch-livefs.iso</filename></entry>
+		  <entry><filename>&os;-<replaceable>version</replaceable>-RELEASE-<replaceable>arch</replaceable>-livefs.iso</filename></entry>
 
 		  <entry>This CD image contains support for booting into
 		    a <quote>livefs</quote> based rescue mode but does not
@@ -4653,7 +4653,7 @@ Please press any key to reboot.</screen>
 
       <para>Anyone with network connectivity to the machine can now
 	chose a media type of FTP and type in
-	<userinput>ftp://your machine</userinput>
+	<userinput>ftp://<replaceable>your machine</replaceable></userinput>
 	after picking <quote>Other</quote> in the FTP sites menu during
 	the install.</para>