Index: server/other/xinetd/xinetd-config-exp.xml
===================================================================
--- server/other/xinetd/xinetd-config-exp.xml	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<sect2>
-<title>Configuration command explanations</title>
-
-<para><userinput> cp /etc/xinetd.conf /etc/xinetd.conf.bak</userinput> : Save the current xinetd.conf file, if it exists.</para>
-
-<para><userinput> sed -e 's/etc/sbin/g' xinetd/sample.config > /etc/xinetd.conf</userinput> : insure the path to all daemons is /usr/sbin, rather than the default path of /usr/etc.</para>
-
-<para><userinput> ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc3.d/S23xinetd</userinput> : Create the xinetd runlevel symlinks to the xinetd boot script, used to start and stop xinetd automatically on machine startup and shutdown.</para>
-
-<para>The format of the <filename>/etc/xinetd.conf</filename> is
-documented in the xinetd.conf man page.  Further information can be
-found at <ulink url="http://www.xinetd.org"/>.</para>
-
-</sect2>
-
Index: server/other/xinetd/xinetd-config.xml
===================================================================
--- server/other/xinetd/xinetd-config.xml	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ server/other/xinetd/xinetd-config.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,14 +1,31 @@
 <sect2>
 <title>Configuring xinetd</title>
-<para>Create the <filename>xinetd.conf</filename> file with the following commands: </para>
-
-<para><screen><userinput>cp /etc/xinetd.conf /etc/xinetd.conf.bak
-sed -e 's/etc/sbin/g' xinetd/sample.conf &gt; /etc/xinetd.conf</userinput></screen></para>
 
 <sect3><title>Config files</title>
+
 <para><filename>/etc/xinetd.conf</filename></para>
 
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Create the <filename>xinetd.conf</filename> file with the following commands:</para>
+
+<screen><userinput><command>cp /etc/xinetd.conf /etc/xinetd.conf.bak</command></userinput></screen>
+
+<para>Insure the path to all daemons is <filename
+class="directory">/usr/sbin</filename>, rather than the default path of
+<filename class="directory">/usr/etc</filename>:</para>
+
+<screen><userinput><command>sed -e 's/etc/sbin/g' xinetd/sample.conf &gt; /etc/xinetd.conf</command>
+</userinput></screen>
+
+<para>The format of the <filename>/etc/xinetd.conf</filename> is
+documented in the xinetd.conf man page. Further information can be
+found at <ulink url="http://www.xinetd.org"/>.</para>
+
 <para>Create the xinetd boot script:</para>
-<para><screen><userinput>cat &gt; /etc/rc.d/init.d/xinetd &lt;&lt; "EOF"</userinput>
+
+<screen><userinput><command>cat &gt; /etc/rc.d/init.d/xinetd &lt;&lt; "EOF"
 #!/bin/bash
 # Begin $rc_base/init.d/xinetd
@@ -44,10 +61,10 @@
 esac
 # End $rc_base/init.d/xinetd
-<userinput>EOF</userinput></screen></para>
+EOF
+chmod 754 /etc/rc.d/init.d/xinetd</command></userinput></screen>
 
 <para>Add the run level symlinks:</para>
 
-<para><screen><userinput>chmod 754 /etc/rc.d/init.d/xinetd &amp;&amp;
-ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc0.d/K49xinetd &amp;&amp;
+<screen><userinput><command>ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc0.d/K49xinetd &amp;&amp;
 ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc1.d/K49xinetd &amp;&amp;
 ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc2.d/K49xinetd &amp;&amp;
@@ -55,23 +72,25 @@
 ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc4.d/S23xinetd &amp;&amp;
 ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc5.d/S23xinetd &amp;&amp;
-ln -s  /etc/rc.d/init.d/xinetd /etc/rc.d/rc6.d/K49xinetd
-</userinput></screen></para>
+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><screen><userinput>/etc/rc.d/init.d/xinetd start</userinput></screen></para>
+
+<screen><userinput><command>/etc/rc.d/init.d/xinetd start</command></userinput></screen>
 
 <para>Checking the <filename>/var/log/daemon.log</filename> file
-should prove quite entertaining.  This file may contain entries
-similar to the following: </para>
+should prove quite entertaining. This file may contain entries
+similar to the following:</para>
 
-<para><screen><userinput>Aug 22 21:40:21 dps10 xinetd[2696]: Server /usr/sbin/in.rlogind is not
+<screen><userinput><command>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]</userinput></screen></para>
+executable [line=42]</command></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></sect3>
+servers that xinetd is trying to control installed yet.</para>
+
+</sect3>
+
 </sect2>
-
Index: server/other/xinetd/xinetd-desc.xml
===================================================================
--- server/other/xinetd/xinetd-desc.xml	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ server/other/xinetd/xinetd-desc.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -3,18 +3,20 @@
 
 <para>The xinetd package contains
-<userinput>xinetd</userinput>,
-<userinput>itox</userinput> and
-<userinput>xconv.pl</userinput>.</para></sect2>
+<command>xinetd</command>,
+<command>itox</command> and
+<command>xconv.pl</command>.</para></sect2>
 
 <sect2><title>Description</title>
 
 <sect3><title>xinetd</title>
-<para>xinetd is the internet services daemon.</para></sect3>
+<para><command>xinetd</command> is the internet services daemon.</para></sect3>
+
 <sect3><title>itox</title>
-<para>itox is a utility used for converting inetd.conf files to
+<para><command>itox</command> is a utility used for converting inetd.conf files to
 xinetd.conf format.</para></sect3>
+
 <sect3><title>xconv.pl</title>
-<para>xconv.pl is a perl script used for converting inetd.conf files
-to xinetd.conf format, similar to itox.</para></sect3>
+<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>
+
 </sect2>
-
Index: server/other/xinetd/xinetd-exp.xml
===================================================================
--- server/other/xinetd/xinetd-exp.xml	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ server/other/xinetd/xinetd-exp.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,6 +1,8 @@
 <sect2>
-<title>Installation command explanations</title>
+<title>Command explanations</title>
 
-<para><userinput>./configure --prefix=/usr</userinput> : Change the default installation directory of <filename>/usr/local</filename>.</para>
+<para><command>./configure --prefix=/usr</command> : Change 
+the default installation directory of 
+<filename class="directory">/usr/local</filename>.</para>
 
 </sect2>
Index: server/other/xinetd/xinetd-inst.xml
===================================================================
--- server/other/xinetd/xinetd-inst.xml	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ server/other/xinetd/xinetd-inst.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,9 +1,10 @@
 <sect2>
-<title>Installation of xinetd</title>
+<title>Installation of <application>xinetd</application></title>
 
-<para>Install xinetd by running the following commands:</para>
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para>Install <application>xinetd</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
+
 </sect2>
-
Index: server/other/xinetd/xinetd-intro.xml
===================================================================
--- server/other/xinetd/xinetd-intro.xml	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ server/other/xinetd/xinetd-intro.xml	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -1,12 +1,16 @@
 <sect2>
-<title>Introduction to xinetd</title>
+<title>Introduction to <application>xinetd</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&xinetd-download-http;"/>
-Download location (FTP):        <ulink url="&xinetd-download-ftp;"/>
-Version used:                   &xinetd-version;
-Package size:                   &xinetd-size;
-Estimated Disk space required:  &xinetd-buildsize;</screen>
+<para><application>xinetd</application> is the eXtended InterNET services Daemon, a secure
+replacement for inetd.</para>
 
-<para>xinetd is the eXtended InterNET services Daemon, a secure
-replacement for inetd.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&xinetd-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&xinetd-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &xinetd-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &xinetd-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &xinetd-time;</para></listitem></itemizedlist>
+</sect3>
+
 </sect2>
Index: server/other/xinetd/xinetd.ent
===================================================================
--- server/other/xinetd/xinetd.ent	(revision e80cc95c31ade4d9df56164eb84de056b8e20929)
+++ server/other/xinetd/xinetd.ent	(revision 5bc2a0191289807e492acaa2ade873e966bd7c0e)
@@ -6,8 +6,8 @@
 <!ENTITY xinetd-desc SYSTEM "xinetd-desc.xml">
 <!ENTITY xinetd-config SYSTEM "xinetd-config.xml">
-<!ENTITY xinetd-buildsize "1.2 MB">
-<!ENTITY xinetd-version "2.3.10">
+<!ENTITY xinetd-buildsize "6.5 MB">
+<!ENTITY xinetd-version "2.3.12">
 <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz">
 <!ENTITY xinetd-download-ftp "">
-<!ENTITY xinetd-size "300 KB">
-<!ENTITY xinetd-time "0.19 SBU">
+<!ENTITY xinetd-size "285 KB">
+<!ENTITY xinetd-time "0.14 SBU">
