diff --git a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
index 8cf2c13121..59ee45aecd 100644
--- a/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml
@@ -1902,12 +1902,12 @@ net.link.ether.bridge.ipfw=1</programlisting>
         a server and one or more clients.  The client remotely accesses
         the data that is stored
         on the server machine.  In order for this to function properly a few
-        processes have to be configured and running:</para>
+        processes have to be configured and running.</para>
 
       <note><para>In &os; 5.X, the <application>portmap</application> utility
-	has been replaced with the <command>rpcbind</command> utility.  Thus,
+	has been replaced with the <application>rpcbind</application> utility.  Thus,
 	in &os; 5.X the user is required to replace every instance of
-	<application>portmap</application> with <command>rpcbind</command>
+	<application>portmap</application> with <application>rpcbind</application>
 	in the forthcoming examples.</para></note>
 
       <para>The server has to be running the following daemons:</para>
@@ -1935,17 +1935,17 @@ net.link.ether.bridge.ipfw=1</programlisting>
 	  </thead>
 	  <tbody>
 	    <row>
-	      <entry>nfsd</entry>
+	      <entry><application>nfsd</application></entry>
 	      <entry>The <acronym>NFS</acronym> daemon which services requests from
               the <acronym>NFS</acronym> clients.</entry>
 	    </row>
 	    <row>
-	      <entry>mountd</entry>
+	      <entry><application>mountd</application></entry>
 	      <entry>The <acronym>NFS</acronym> mount daemon which carries out
 		the requests that &man.nfsd.8; passes on to it.</entry>
 	    </row>
 	    <row>
-	      <entry>portmap</entry>
+	      <entry><application>portmap</application></entry>
 	      <entry> The portmapper daemon
                 allows <acronym>NFS</acronym> clients to discover which port the <acronym>NFS</acronym> server
                 is using.</entry>
@@ -1984,7 +1984,7 @@ net.link.ether.bridge.ipfw=1</programlisting>
 nfs_server_enable="YES"
 mountd_flags="-r"</programlisting>
 
-      <para><command>mountd</command> runs automatically whenever the
+      <para><application>mountd</application> runs automatically whenever the
         <acronym>NFS</acronym> server is enabled.</para>
 
       <para>On the client, make sure this option is present in
@@ -2044,7 +2044,7 @@ mountd_flags="-r"</programlisting>
 	data on the exported filesystem as <username>root</username>.
 	If the <literal>-maproot=root</literal> flag is not specified,
 	then even if a user has <username>root</username> access on
-	the remote system, they will not be able to modify files on
+	the remote system, he will not be able to modify files on
 	the exported filesystem.</para>
 
       <programlisting>/a  -maproot=root  host.example.com box.example.org</programlisting>
@@ -2090,7 +2090,7 @@ mountd_flags="-r"</programlisting>
 /exports/obj -ro</programlisting>
 
       <para>You must restart
-        <command>mountd</command> whenever you modify
+        <application>mountd</application> whenever you modify
         <filename>/etc/exports</filename> so the changes can take effect.
         This can be accomplished by sending the HUP signal
         to the <command>mountd</command> process:</para>
@@ -2114,8 +2114,8 @@ mountd_flags="-r"</programlisting>
 
       <para>Now everything should be ready to actually mount a remote file
 	system.  In these examples the
-	server's name will be <literal>server</literal> and the client's
-	name will be <literal>client</literal>.  If you only want to
+	server's name will be <hostid>server</hostid> and the client's
+	name will be <hostid>client</hostid>.  If you only want to
 	temporarily mount a remote filesystem or would rather test the
 	configuration, just execute a command like this as <username>root</username> on the
         client:</para>
@@ -2351,7 +2351,7 @@ Exports list on foobar:
 
       <para>For anyone who cares, here is what happens when the failure
 	occurs, which also explains why it is unrecoverable.  NFS
-	typically works with a <quote>block</quote> size of 8&nbsp;k (though it
+	typically works with a <quote>block</quote> size of 8&nbsp;K (though it
 	may do fragments of smaller sizes).  Since the maximum Ethernet
 	packet is around 1500&nbsp;bytes, the NFS <quote>block</quote> gets
 	split into multiple Ethernet packets, even though it is still a