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 ad41c9fd34..182eb00b5f 100644
--- a/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
+++ b/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml
@@ -4490,7 +4490,7 @@ DocumentRoot /www/someotherdomain.tld
 
 	<para>Once <application>swat</application> has been enabled in
 	  <filename>inetd.conf</filename>, you can use a browser to
-	  connect to <hostid>http://localhost:901</hostid>.  You will
+	  connect to <ulink url="http://localhost:901"></ulink>.  You will
 	  first have to log on with the system <username>root</username> account.</para>
 
 <!-- XXX screenshots go here, loader is creating them -->
@@ -4498,7 +4498,7 @@ DocumentRoot /www/someotherdomain.tld
 	<para>Once you have successfully logged on to the main
 	  <application>Samba</application> configuration page, you can
 	  browse the system documentation, or begin by clicking on the
-	  'Globals' tab.  The Globals section corresponds to the
+	  <guimenu>Globals</guimenu> tab.  The <guimenu>Globals</guimenu> section corresponds to the
 	  variables that are set in the <literal>[global]</literal>
 	  section of
 	  <filename>/usr/local/etc/smb.conf</filename>.</para>
@@ -4515,7 +4515,7 @@ DocumentRoot /www/someotherdomain.tld
 
         <variablelist>
 	  <varlistentry>
-	    <term>workgroup</term>
+	    <term><literal>workgroup</literal></term>
 
 	    <listitem>
 	      <para>NT Domain-Name or Workgroup-Name for the computers
@@ -4524,7 +4524,7 @@ DocumentRoot /www/someotherdomain.tld
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>netbios name</term>
+	    <term><literal>netbios name</literal></term>
 	    <indexterm><primary>NetBIOS</primary></indexterm>
 
 	    <listitem>
@@ -4535,11 +4535,11 @@ DocumentRoot /www/someotherdomain.tld
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>server string</term>
+	    <term><literal>server string</literal></term>
 
 	    <listitem>
 	      <para>This sets the string that will be displayed with
-		the <literal>net view</literal> command and some other
+		the <command>net view</command> command and some other
 		networking tools that seek to display descriptive text
 		about the server.</para>
 	    </listitem>
@@ -4558,12 +4558,12 @@ DocumentRoot /www/someotherdomain.tld
 
         <variablelist>
 	  <varlistentry>
-	    <term>security</term>
+	    <term><literal>security</literal></term>
 
 	    <listitem>
 	      <para>The two most common options here are
-	        <option>security = share</option> and <option>security
-	        = user</option>.  If your clients use usernames that
+	        <literal>security = share</literal> and <literal>security
+	        = user</literal>.  If your clients use usernames that
 	        are the same as their usernames on your &os; machine
 	        then you will want to use user level security.  This
 	        is the default security policy and it requires clients
@@ -4579,7 +4579,7 @@ DocumentRoot /www/someotherdomain.tld
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>passdb backend</term>
+	    <term><literal>passdb backend</literal></term>
 
 	    <indexterm><primary>NIS+</primary></indexterm>
 	    <indexterm><primary>LDAP</primary></indexterm>
@@ -4590,13 +4590,13 @@ DocumentRoot /www/someotherdomain.tld
 	        different backend authentication models.  You can
 	        authenticate clients with LDAP, NIS+, a SQL database,
 	        or a modified password file.  The default
-	        authentication method is <option>smbpasswd</option>,
+	        authentication method is <literal>smbpasswd</literal>,
 	        and that is all that will be covered here.</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
 
-	<para>Assuming that the default <option>smbpasswd</option>
+	<para>Assuming that the default <literal>smbpasswd</literal>
 	  backend is used, the
 	  <filename>/usr/local/private/smbpasswd</filename> file must
 	  be created to allow <application>Samba</application> to