Index: appendices/old/old.xml
===================================================================
--- appendices/old/old.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ appendices/old/old.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -16,5 +16,5 @@
 &postlfs-security-nessus;
 &bonobo-conf;
-&inetutils;
+<!-- &inetutils; -->
 &STLport;
 </appendix>
Index: basicnet/netprogs/inetutils/inetutils-desc.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-desc.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ basicnet/netprogs/inetutils/inetutils-desc.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -10,5 +10,5 @@
 
 <sect3><title>ftp</title>
-<para>ARPANET file transfer program.</para></sect3>
+<para><command>ftp</command> is a ARPANET file transfer client.</para></sect3>
 
 <sect3><title>logger</title>
@@ -20,11 +20,11 @@
 
 <sect3><title>rcp</title>
-<para><command>rcp</command> is remote file copy.</para></sect3>
+<para><command>rcp</command> is a remote file copy client.</para></sect3>
 
 <sect3><title>rlogin</title>
-<para><command>rlogin</command> is remote login.</para></sect3>
+<para><command>rlogin</command> is a remote login client.</para></sect3>
 
 <sect3><title>rsh</title>
-<para><command>rsh</command> is remote shell.</para></sect3>
+<para><command>rsh</command> is a remote shell client.</para></sect3>
 
 <sect3><title>syslogd</title>
@@ -35,35 +35,35 @@
 
 <sect3><title>telnet</title>
-<para><command>telnet</command> is the user interface to the TELNET protocol.</para></sect3>
+<para><command>telnet</command> is a user interface to the TELNET protocol.</para></sect3>
 
 <sect3><title>tftp</title>
-<para><command>tftp</command> is the trivial file transfer program.</para></sect3>
+<para><command>tftp</command> is a trivial file transfer program.</para></sect3>
 
 <sect3><title>whois</title>
-<para>client for whois directory service.</para></sect3>
+<para><command>whois</command> is a client for the whois directory service.</para></sect3>
 
 <sect3><title>ftpd</title>
-<para>DARPA Internet File Transfer Protocol server.</para></sect3>
+<para><command>ftpd</command> is a DARPA Internet File Transfer Protocol server.</para></sect3>
 
 <sect3><title>inetd</title>
-<para>internet super-server.</para></sect3>
+<para><command>inetd</command> is a internet super-server.</para></sect3>
 
 <sect3><title>rexecd</title>
-<para>remote execution server.</para></sect3>
+<para><command>rexcd</command> is a remote execution server.</para></sect3>
 
 <sect3><title>rlogind</title>
-<para>remote login server.</para></sect3>
+<para><command>rlogind</command> is a remote login server.</para></sect3>
 
 <sect3><title>rshd</title>
-<para>remote shell server.</para></sect3>
+<para><command>rshd</command> is a remote shell server.</para></sect3>
 
 <sect3><title>talkd</title>
-<para>remote user communication server.</para></sect3>
+<para><command>talkd</command> is a remote user communication server.</para></sect3>
 
 <sect3><title>telnetd</title>
-<para>DARPA TELNET protocol server.</para></sect3>
+<para><command>telnetd</command> is a DARPA TELNET protocol server.</para></sect3>
 
 <sect3><title>tftpd</title>
-<para>Internet Trivial File Transfer Protocol server.</para></sect3>
+<para><command>tftpd</command> is a Internet Trivial File Transfer Protocol server.</para></sect3>
 
 <sect3><title>uucpd</title>
Index: basicnet/netprogs/inetutils/inetutils-exp.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-exp.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ basicnet/netprogs/inetutils/inetutils-exp.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -2,15 +2,20 @@
 <title>Command explanations</title>
 
-<para><userinput>--disable-dependancy-tracking</userinput> : This option
+<para><command>--disable-dependancy-tracking</command> : This switch
 speeds up one time builds.</para>
 
-<para><userinput>--disable-syslogd</userinput> : This option  prevents
-inetutils installing the System Log Daemon, which is installed in the LFS Book.</para>
+<para><command>--disable-syslogd</command> : This switch  prevents
+<application>Inetutils</application> installing a System Log Daemon, which is 
+installed in the <acronym>LFS</acronym> Book.</para>
 
-<para><userinput>--with-wrap</userinput> : This option makes inetutils compile
-against tcp-wrappers. Omit this option if you didn't install tcp-wrappers.</para>
+<para><command>--with-wrap</command> : This switch makes <application>Inetutils
+</application> compile against <application>tcp-wrappers</application>. Omit 
+this option if you didn't install <application>tcp-wrappers</application>.
+</para>
 
-<para><userinput>--with-pam</userinput> : This option makes inetutils compile
-against for Linux-PAM. Add this option if you want to utilize PAM.</para>
+<para><command>--with-pam</command> : This switch makes <application>Inetutils
+</application> compile against for <application>Linux-<acronym>PAM</acronym>
+</application>. Add this option if you want to utilize <acronym>PAM</acronym>.
+</para>
 </sect2>
 
Index: basicnet/netprogs/inetutils/inetutils-inst.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-inst.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ basicnet/netprogs/inetutils/inetutils-inst.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -1,12 +1,13 @@
 <sect2>
-<title>Installation of inetutils</title>
+<title>Installation of <application>Inetutils</application></title>
 
-<para>Install inetutils by running the following commands:</para>
+<para>Install <application>Inetutils</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --disable-syslogd \
+<screen><userinput><command>./configure --prefix=/usr --disable-syslogd \
 	--libexecdir=/usr/sbin --infodir=/usr/share/info \
 	--mandir=/usr/share/man --with-wrap &amp;&amp;
 make &amp;&amp;
-make install </userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netprogs/inetutils/inetutils-intro.xml
===================================================================
--- basicnet/netprogs/inetutils/inetutils-intro.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ basicnet/netprogs/inetutils/inetutils-intro.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -1,15 +1,22 @@
 <sect2>
-<title>Introduction to inetutils</title>
+<title>Introduction to <application>Inetutils</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&inetutils-download-http;"/>
-Download location (FTP):        <ulink url="&inetutils-download-ftp;"/>
-Version used:                   &inetutils-version;
-Package size:                   &inetutils-size;
-Estimated Disk space required:  &inetutils-buildsize;</screen>
+<para>The <application>Inetutils</application> package contains network clients 
+and servers.</para>
 
-<para>The inetutils package contains network client's and server's.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&inetutils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&inetutils-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &inetutils-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &inetutils-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &inetutils-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>inetutils will utilize:
-<xref linkend="Linux_PAM"/></screen>
+<sect3><title><application>Inetutils</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="Linux_PAM"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: basicnet/netprogs/inetutils/inetutils.ent
===================================================================
--- basicnet/netprogs/inetutils/inetutils.ent	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ basicnet/netprogs/inetutils/inetutils.ent	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -10,2 +10,3 @@
 <!ENTITY inetutils-download-ftp "ftp://ftp.gnu.org/gnu/inetutils/inetutils-1.4.2.tar.gz">
 <!ENTITY inetutils-size "1018 KB">
+<!ENTITY inetutils-time "">
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ basicnet/netprogs/netprogs.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -15,5 +15,5 @@
 &tcpwrappers;
 &portmap;
-<!-- &inetutils; -->
+&inetutils;
 &nfs-utils;
 &ncpfs;
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ xsoft/suites/koffice.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -42,7 +42,7 @@
 <para>Install <application>KOffice</application> with the following
 commands:</para>
-<screen><userinput>./configure --prefix=&kde-dir; --disable-debug &amp;&amp;
+<screen><userinput><command>./configure --prefix=&kde-dir; --disable-debug &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen>
+make install</command></userinput></screen>
 </sect2>
      
Index: xsoft/suites/openoffice/openoffice-intro.xml
===================================================================
--- xsoft/suites/openoffice/openoffice-intro.xml	(revision 46bca1186c590d2abe8937e77279d48076c96561)
+++ xsoft/suites/openoffice/openoffice-intro.xml	(revision dddaf959666cd3755455f1cae17e89371b2be3c9)
@@ -36,5 +36,5 @@
 url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/>.</para>
 
-<para>Also download the various patches from <userinput><ulink url="&hfile-root;"/></userinput>.
+<para>Also download the various patches from <ulink url="&hfile-root;"/>.
 The <filename>openoffice-&openoffice-version;-no-pam.patch</filename> is needed only if
 Linux PAM is not installed. The <filename>openoffice-&openoffice-version;-no-mozab.patch</filename>
