diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
index a07d419e12..d128303e90 100644
--- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.sgml
@@ -156,7 +156,7 @@
 	  USB are supported.  SMP is supported on machines with multiple
 	  CPUs.</para>
 
-	<para>A 32-bit kernel can only use the first 2GB of RAM.
+	<para>A 32-bit kernel can only use the first 2&nbsp;GB of RAM.
 	  &firewire; is not supported on the Blue & White PowerMac
 	  G3.</para>
       </sect3>
@@ -404,7 +404,7 @@
 
       <para>Copies of &os; installation media are available at the
 	<ulink url="&url.base;/where.html#download">&os; web
-	site.</ulink></para>
+	site</ulink>.</para>
 
       <tip>
 	<para>If you already have a copy of &os; on CDROM, DVD, or USB
@@ -487,9 +487,9 @@
 	    </warning>
 
 	    <step>
-	      <title>Obtaining <application>Image Writer for Windows</application></title>
+	      <title>Obtaining <application>Image Writer for &windows;</application></title>
 
-	      <para><application>Image Writer for Windows</application> is a
+	      <para><application>Image Writer for &windows;</application> is a
 		free application that can correctly write an image file to a
 		memory stick.  Download it from
 		<ulink url="https://launchpad.net/win32-image-writer/"></ulink>
@@ -938,7 +938,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
       for &os;&nbsp;9.0.</para>
 
     <note>
-      <para>Kris Moore's <application>pc-sysinstall</application> is
+      <para>&a.kmoore;'s <application>pc-sysinstall</application> is
 	included with <ulink url="http://pcbsd.org">PC-BSD</ulink>, and
 	can also be used to <ulink
 	url="http://wiki.pcbsd.org/index.php/Use_PC-BSD_Installer_to_Install_FreeBSD">
@@ -1072,10 +1072,10 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	  <warning>
 	    <para>The installation program does not check to see if you have
 	      adequate space.  Select this option only if you have
-	      adequate hard disk space.  As of FreeBSD&nbsp;9.0, the
-	      FreeBSD Ports Collection takes up about &ports.size; of disk
+	      adequate hard disk space.  As of &os;&nbsp;9.0, the
+	      &os; Ports Collection takes up about &ports.size; of disk
 	      space.  You can safely assume a larger value for more recent
-	      versions of FreeBSD.</para>
+	      versions of &os;.</para>
 	  </warning>
 	</listitem>
 
@@ -1315,7 +1315,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	three partitions:</para>
 
       <itemizedlist>
-	<title>Standard FreeBSD <acronym>GPT</acronym> Partitions</title>
+	<title>Standard &os; <acronym>GPT</acronym> Partitions</title>
 	<listitem>
 	  <para><literal>freebsd-boot</literal> - &os; boot code.  This
 	  partition must be first on the disk.</para>
@@ -1878,7 +1878,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...</screen>
 	<title>Additional Services</title>
 	<listitem>
 	  <para><literal>sshd</literal> - Secure Shell
-	    (<acronym role="Secure Shell">SSH</acronym>)Daemon for secure
+	    (<acronym role="Secure Shell">SSH</acronym>) daemon for secure
 	    remote access.</para>
 	</listitem>