In Samba section:

- Add missing username and application tags
- Try to be consistent on application tags use: deamons should be tagged
  with these tags when possible
- Add missing entities (&unix; and &windows;)

More fixes are needed, I'll do it later.

en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml

@@ -4477,9 +4477,9 @@ DocumentRoot /www/someotherdomain.tld
 	<title>Using the Samba Web Administration Tool (SWAT)</title>
 
 	<para>The Samba Web Administration Tool (SWAT) runs as a
-	  daemon from <command>inetd</command>.  Therefore, the
+	  daemon from <application>inetd</application>.  Therefore, the
 	  following line in <filename>/etc/inetd.conf</filename>
-	  should be uncommented before <command>swat</command> can be
+	  should be uncommented before <application>swat</application> can be
 	  used to configure <application>Samba</application>:</para>
 
 	<programlisting>swat   stream  tcp     nowait/400      root    /usr/local/sbin/swat</programlisting>
@@ -4491,7 +4491,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
-	  first have to log on with the system root account.</para>
+	  first have to log on with the system <username>root</username> account.</para>
 
 <!-- XXX screenshots go here, loader is creating them -->
 
@@ -4528,7 +4528,7 @@ DocumentRoot /www/someotherdomain.tld
 	    <indexterm><primary>NetBIOS</primary></indexterm>
 
 	    <listitem>
-	      <para>This sets the NetBIOS name by which a Samba server
+	      <para>This sets the NetBIOS name by which a <application>Samba</application> server
 		is known. By default it is the same as the first
 		component of the host's DNS name.</para>
 	    </listitem>
@@ -4601,7 +4601,7 @@ DocumentRoot /www/someotherdomain.tld
 	  <filename>/usr/local/private/smbpasswd</filename> file must
 	  be created to allow <application>Samba</application> to
 	  authenticate clients.  If you would like to give all of
-	  your Unix user accounts access from Windows clients, use the
+	  your &unix; user accounts access from &windows; clients, use the
 	  following command:</para>
 
 	<screen>&prompt.root; <userinput>cat /etc/passwd | grep -v "^#" | make_smbpasswd &gt; /usr/local/private/smbpasswd</userinput>
@@ -4634,11 +4634,11 @@ Starting smbd.</screen>
 
       <para><application>Samba</application> actually consists of
         three separate daemons.  You should see that both the
-        <command>nmbd</command> and <command>smbd</command> daemons
+        <application>nmbd</application> and <application>smbd</application> daemons
         are started by the <filename>samba.sh</filename> script.  If
         you enabled winbind name resolution services in
         <filename>smb.conf</filename>, then you will also see that
-        the <command>winbindd</command> daemon is started.</para>
+        the <application>winbindd</application> daemon is started.</para>
 
       <para>You can stop <application>Samba</application> at any time
         by typing :</para>