Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/other.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -2,4 +2,11 @@
 <?dbhtml filename="other.html" dir="server"?>
 <title>Other Server Software</title>
+
+<para>Here you will find many ways to share your machine with the rest
+of the world or your local network.  Before installing
+any packages in this chapter, you need to be sure you understand what
+the package does and how to set it up correctly.  It might also be
+helpful to learn about the consequences of an improper setup so
+that you can analyze the risks.</para>
 
 &bind;
Index: server/other/rsync/rsync-config.xml
===================================================================
--- server/other/rsync/rsync-config.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/rsync/rsync-config.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -8,5 +8,5 @@
 additional options (i.e. user authentification).</para>
 
-<para><screen><userinput><command>cat &gt; /etc/rsyncd.conf &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt; /etc/rsyncd.conf &lt;&lt; "EOF"</command>
 # This is a basic rsync configuration file
 # It exports a single module without user authentification.
@@ -23,15 +23,17 @@
 	gid = rsyncd
 
-<command>EOF</command></userinput></screen></para>
+<command>EOF</command></userinput></screen>
 </sect3>
 
 <sect3><title>rsyncd init.d script</title>
 
-<para>Note that you only want to start the rsync server if you want to provide
-a rsync archive on your machine. The rsync client doesn't need this script to be
-sed.  Having said that, if you want to run the rsync daemon, the rsyncd
-init.d script can be created using the following commands:</para>
+<para>Note that you only want to start the <application>rsync</application> 
+server if you want to provide a <application>rsync</application> archive on 
+your machine. The <application>rsync</application> client doesn't need this 
+script to be used.  Having said that, if you want to run the <application>rsync
+</application> daemon, the <command>rsyncd</command> init.d script can be 
+created using the following commands:</para>
 
-<para><screen><userinput><command>cat &gt; /etc/rc.d/init.d/rsyncd &lt;&lt; "EOF"</command>
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/rsyncd &lt;&lt; "EOF"</command>
 #!/bin/sh
 # Begin $rc_base/init.d/rsyncd
@@ -77,9 +79,9 @@
 # End $rc_base/init.d/rsyncd
 <command>EOF
-chmod 755 /etc/rc.d/init.d/rsyncd</command></userinput></screen></para>
+chmod 755 /etc/rc.d/init.d/rsyncd</command></userinput></screen>
 
 <para>Create the symbolic links to this file in the relevant
 <filename class="directory">rc.d</filename> directories with the following
-commands:
+commands:</para>
 <screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
 ln -sf ../init.d/rsyncd ../rc0.d/K30rsyncd &amp;&amp;
@@ -89,5 +91,5 @@
 ln -sf ../init.d/rsyncd ../rc4.d/S30rsyncd &amp;&amp;
 ln -sf ../init.d/rsyncd ../rc5.d/S30rsyncd &amp;&amp;
-ln -sf ../init.d/rsyncd ../rc6.d/K30rsyncd</command></userinput></screen></para>
+ln -sf ../init.d/rsyncd ../rc6.d/K30rsyncd</command></userinput></screen>
 
 </sect3>
Index: server/other/rsync/rsync-desc.xml
===================================================================
--- server/other/rsync/rsync-desc.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/rsync/rsync-desc.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -9,5 +9,6 @@
 
 <sect3><title>rsync</title>
-<para>rsync is a replacement for rcp (and scp) that has many more features. It
+<para><application>rsync</application> is a replacement for <command>rcp
+</command> (and <command>scp</command>) that has many more features. It
 uses the "rsync algorithm" which provides a very fast method for remote files
 into sync. It does this by sending just the differences in the files across the
Index: server/other/rsync/rsync-inst.xml
===================================================================
--- server/other/rsync/rsync-inst.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/rsync/rsync-inst.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -2,17 +2,17 @@
 <title>Installation of <application>rsync</application></title>
 
-<para>For security reasons, running rsync server as an unpriviledged user and
-group is encouraged.</para>
+<para>For security reasons, running <application>rsync</application> server as 
+an unpriviledged user and group is encouraged.</para>
 
-<para><screen><userinput><command>groupadd rsyncd &amp;&amp;
+<screen><userinput><command>groupadd rsyncd &amp;&amp;
 useradd -c rsyncd -d /home/rsync -g rsyncd -s /bin/false rsyncd</command>
-</userinput></screen></para>
+</userinput></screen>
 
 <para>Install <application>rsync</application> by running the following
 commands:</para>
 
-<para><screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install </command></userinput></screen></para>
+make install </command></userinput></screen>
 
 </sect2>
Index: server/other/rsync/rsync-intro.xml
===================================================================
--- server/other/rsync/rsync-intro.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/rsync/rsync-intro.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -2,6 +2,7 @@
 <title>Introduction to <application>rsync</application></title>
 
-<para>The <application>rsync</application> package contains the rsync utility.
-This is useful for synchronizing large file archives over a network.</para>
+<para>The <application>rsync</application> package contains the
+<command>rsync</command> utility. This is useful for synchronizing large file 
+archives over a network.</para>
 
 <sect3><title>Package information</title>
Index: server/other/xinetd/xinetd-config.xml
===================================================================
--- server/other/xinetd/xinetd-config.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/xinetd/xinetd-config.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring xinetd</title>
+<title>Configuring <application>xinetd</application></title>
 
 <sect3><title>Config files</title>
@@ -25,7 +25,7 @@
 found at <ulink url="http://www.xinetd.org"/>.</para>
 
-<para>Create the xinetd boot script:</para>
+<para>Create the <command>xinetd</command> boot script:</para>
 
-<screen><userinput><command>cat &gt; /etc/rc.d/init.d/xinetd &lt;&lt; "EOF"
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/xinetd &lt;&lt; "EOF"</command>
 #!/bin/bash
 # Begin $rc_base/init.d/xinetd
@@ -61,5 +61,5 @@
 esac
 # End $rc_base/init.d/xinetd
-EOF
+<command>EOF
 chmod 754 /etc/rc.d/init.d/xinetd</command></userinput></screen>
 
@@ -74,5 +74,5 @@
 ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc6.d/K49xinetd</command></userinput></screen>
 
-<para>Now, we'll use our new boot script to start xinetd: </para>
+<para>Now, we'll use our new boot script to start <command>xinetd</command>: </para>
 
 <screen><userinput><command>/etc/rc.d/init.d/xinetd start</command></userinput></screen>
@@ -82,13 +82,13 @@
 similar to the following:</para>
 
-<screen><userinput><command>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not
+<screen><userinput>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not
 executable [line=29]
 Aug 22 21:40:21 dps10 xinetd[2696]: Error parsing attribute server -
 DISABLING SERVICE [line=29]
 Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rshd is not
-executable [line=42]</command></userinput></screen>
+executable [line=42]</userinput></screen>
 
 <para>These errors are due to the fact that we don't have most of the
-servers that xinetd is trying to control installed yet.</para>
+servers that <command>xinetd</command> is trying to control installed yet.</para>
 
 </sect3>
Index: server/other/xinetd/xinetd-desc.xml
===================================================================
--- server/other/xinetd/xinetd-desc.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/xinetd/xinetd-desc.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The xinetd package contains
+<para>The <application>xinetd</application> package contains
 <command>xinetd</command>,
 <command>itox</command> and
@@ -13,10 +13,12 @@
 
 <sect3><title>itox</title>
-<para><command>itox</command> is a utility used for converting inetd.conf files to
-xinetd.conf format.</para></sect3>
+<para><command>itox</command> is a utility used for converting
+<filename>inetd.conf</filename> files to
+<filename>xinetd.conf</filename> format.</para></sect3>
 
 <sect3><title>xconv.pl</title>
-<para><command>xconv.pl</command> is a perl script used for converting inetd.conf files
-to xinetd.conf format, similar to <command>itox</command>.</para></sect3>
+<para><command>xconv.pl</command> is a perl script used for converting
+<filename>inetd.conf</filename> files to <filename>xinetd.conf</filename> 
+format, similar to <command>itox</command>.</para></sect3>
 
 </sect2>
Index: server/other/xinetd/xinetd-intro.xml
===================================================================
--- server/other/xinetd/xinetd-intro.xml	(revision 40330fcd2fe93432069ade921101831ce0f2220b)
+++ server/other/xinetd/xinetd-intro.xml	(revision cce6b02e1c8ad5bfd88cfb8a9037cd2fc1f6bf6b)
@@ -2,6 +2,6 @@
 <title>Introduction to <application>xinetd</application></title>
 
-<para><application>xinetd</application> is the eXtended InterNET services Daemon, a secure
-replacement for inetd.</para>
+<para><application>xinetd</application> is the eXtended InterNET services 
+Daemon, a secure replacement for <command>inetd</command>.</para>
 
 <sect3><title>Package information</title>
