diff --git a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
index 6fa240d963..d9a00bc360 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
@@ -4045,9 +4045,9 @@ zone "10.168.192.in-addr.arpa" in {
 
       <note><para>This section covers version 1.3.X of the
         <application>Apache HTTP Server</application> as that is the
-        most widely used version for &os;.  Apache 2.X introduces many
+        most widely used version for &os;.  <application>Apache&nbsp;2.X</application> introduces many
         new technologies but they are not discussed here.  For more
-        information about Apache 2.X, please see <ulink
+        information about <application>Apache&nbsp;2.X</application>, please see <ulink
         url="http://httpd.apache.org/"></ulink>.</para></note>
 
     </sect2>
@@ -4058,10 +4058,10 @@ zone "10.168.192.in-addr.arpa" in {
       <indexterm><primary>Apache</primary>
 	<secondary>configuration file</secondary></indexterm>
 
-      <para>The main Apache HTTP Server configuration file is
+      <para>The main <application>Apache HTTP Server</application> configuration file is
 	installed as
 	<filename>/usr/local/etc/apache/httpd.conf</filename> on &os;.
-	This file is a typical Unix text configuration file with
+	This file is a typical &unix; text configuration file with
 	comment lines beginning with the <literal>#</literal>
 	character.  A comprehensive description of all possible
 	configuration options is outside the scope of this book, so
@@ -4074,7 +4074,7 @@ zone "10.168.192.in-addr.arpa" in {
 
 	  <listitem>
 	    <para>This specifies the default directory hierarchy for
-	    the Apache installation.  Binaries are stored in the
+	    the <application>Apache</application> installation.  Binaries are stored in the
 	    <filename role="directory">bin</filename> and 
 	    <filename role="directory">sbin</filename> subdirectories
 	    of the server root, and configuration files are stored in
@@ -4116,7 +4116,7 @@ zone "10.168.192.in-addr.arpa" in {
       </variablelist>
 
       <para>It is always a good idea to make backup copies of your
-	Apache configuration file before making changes.  Once you are
+	<application>Apache</application> configuration file before making changes.  Once you are
 	satisfied with your initial configuration you are ready to
 	start running <application>Apache</application>.</para>
 
@@ -4190,7 +4190,7 @@ Log file format -->
 
       <para>To setup <application>Apache</application> to use
         Name-based Virtual Hosting add an entry like the following to
-        your <filename>httpd.conf</filename>.</para>
+        your <filename>httpd.conf</filename>:</para>
 
       <programlisting>NameVirtualHost *</programlisting>
 
@@ -4226,7 +4226,7 @@ DocumentRoot /www/someotherdomain.tld
       <indexterm><primary>Apache</primary>
 	<secondary>modules</secondary></indexterm>
 
-      <para>There are many different Apache modules available to add
+      <para>There are many different <application>Apache</application> modules available to add
         functionality to the basic server.  The FreeBSD Ports
         Collection provides an easy way to install
         <application>Apache</application> together with some of the
@@ -4248,7 +4248,7 @@ DocumentRoot /www/someotherdomain.tld
           that you can run a secure web server on &os;.</para>
 
 	<para>If you have not yet installed
-	  <application>Apache</application>, then a version of Apache
+	  <application>Apache</application>, then a version of <application>Apache</application>
 	  that includes mod_ssl may be installed with the <filename
 	  role="package">www/apache13-modssl</filename> port.</para>
 
@@ -4262,16 +4262,16 @@ DocumentRoot /www/someotherdomain.tld
 
 	<indexterm><primary>Perl</primary></indexterm>
 
-        <para>The Apache/Perl integration project brings together the
-	  full power of the Perl programming language and the Apache
-	  HTTP server.  With the mod_perl module it is possible to
-	  write Apache modules entirely in Perl.  In addition, the
+        <para>The <application>Apache</application>/Perl integration project brings together the
+	  full power of the Perl programming language and the <application>Apache
+	  HTTP Server</application>.  With the mod_perl module it is possible to
+	  write <application>Apache</application> modules entirely in Perl.  In addition, the
 	  persistent interpreter embedded in the server avoids the
 	  overhead of starting an external interpreter and the penalty
 	  of Perl start-up time.</para>
 
 	<para>If you have not yet installed
-	  <application>Apache</application>, then a version of Apache
+	  <application>Apache</application>, then a version of <application>Apache</application>
 	  that includes mod_perl may be installed with the <filename
 	  role="package">www/apache13-modperl</filename> port.</para>
       </sect3>
@@ -4285,7 +4285,7 @@ DocumentRoot /www/someotherdomain.tld
 	  Preprocessor</quote> is a widely-used Open Source
 	  general-purpose scripting language that is especially suited
 	  for Web development and can be embedded into HTML.  Its
-	  syntax draws upon C, Java, and Perl, and is easy to learn.
+	  syntax draws upon C, &java;, and Perl, and is easy to learn.
 	  The main goal of the language is to allow web developers to
 	  write dynamically generated webpages quickly, but you can do
 	  much more with PHP.</para>