Index: basicnet/netutils/traceroute/traceroute-desc.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-desc.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netutils/traceroute/traceroute-desc.xml	(revision 6998c44a92fbea3aa77c715eea92f608764618aa)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The traceroute package contains <userinput>traceroute</userinput>.</para>
+<para>The <application>Traceroute</application> package contains <userinput>traceroute</userinput>.</para>
 
 </sect2>
@@ -9,5 +9,8 @@
 
 <sect3><title>traceroute</title>
-<para>Traceroute does basically what it says: it traces the route your packets take from the host you are working on to another host on a network, showing all the intermediate steps (routers) along the way.</para></sect3>
+<para><command>traceroute</command> does basically what it says: it traces the 
+route your packets take from the host you are working on to another host on a 
+network, showing all the intermediate steps (routers) along the way.</para>
+</sect3>
 
 </sect2>
Index: basicnet/netutils/traceroute/traceroute-exp.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-exp.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netutils/traceroute/traceroute-exp.xml	(revision 6998c44a92fbea3aa77c715eea92f608764618aa)
@@ -2,25 +2,28 @@
 <title>Command explanations</title>
 
-<para><screen><userinput>sed 's/-o bin/-o root/'...</userinput></screen>
-Adjusts the Makefile so that the program is installed with user root instead
-of user bin (which doesn't exist on a default LFS system).</para>
+<para><screen><command>sed 's/-o bin/-o root/'...</command></screen>
+Adjusts the <filename>Makefile</filename> so that the program is installed 
+with user root instead of user bin (which doesn't exist on a default
+<acronym>LFS</acronym> system).</para>
 
-<para><userinput>make install</userinput> : Installs traceroute setuid root 
-in the <filename>/usr/sbin</filename> directory. This makes it possible for all users to execute 
-traceroute. For absolute security, turn off the setuid bit in traceroute's 
-file permissions with the command: 
-<screen><userinput>chmod 0755 /usr/sbin/traceroute</userinput></screen></para>
+<para><command>make install</command> : Installs <command>traceroute</command> 
+setuid root in the <filename>/usr/sbin</filename> directory. This makes it 
+possible for all users to execute <command>traceroute</command>. For absolute 
+security, turn off the setuid bit in <command>traceroute</command>'s file 
+permissions with the command: 
+<screen><command>chmod 0755 /usr/sbin/traceroute</command></screen></para>
 
 <para>The risk is that if a security problem such as a buffer overflow were 
-ever found in the traceroute code, a regular user on your system could gain 
-root access if the program is setuid root. Removing the setuid permission 
-of course also makes it impossible for users other than root to utilize 
-traceroute, so decide what's right for your individual situation.</para>
+ever found in the <application>Traceroute</application> code, a regular user 
+on your system could gain root access if the program is setuid root. Removing 
+the setuid permission of course also makes it impossible for users other than 
+root to utilize <command>traceroute</command>, so decide what's right for your 
+individual situation.</para>
 
-<para>Now, to be completely FHS compliant, as is our aim, if you do leave the 
-traceroute binary setuid root, then you should move traceroute to
-<filename>/usr/bin</filename> 
+<para>Now, to be completely <acronym>FHS</acronym> compliant, as is our aim, if 
+you do leave the <command>traceroute</command> binary setuid root, then you 
+should move <filename>traceroute</filename> to <filename>/usr/bin</filename> 
 with the following command: 
-<screen><userinput>mv /usr/sbin/traceroute /usr/bin</userinput></screen></para>
+<screen><command>mv /usr/sbin/traceroute /usr/bin</command></screen></para>
 
 <para>This ensures that the binary is in the path for non-root users.</para>
Index: basicnet/netutils/traceroute/traceroute-inst.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-inst.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netutils/traceroute/traceroute-inst.xml	(revision 6998c44a92fbea3aa77c715eea92f608764618aa)
@@ -1,13 +1,14 @@
 <sect2>
-<title>Installation of traceroute</title>
+<title>Installation of <application>Traceroute</application></title>
 
-<para>Install traceroute by running the following commands:</para>
+<para>Install <application>Traceroute</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>cp Makefile.in Makefile.in.bak &amp;&amp;
+<screen><userinput><command>cp Makefile.in Makefile.in.bak &amp;&amp;
 sed 's/-o bin/-o root/' Makefile.in.bak &gt; Makefile.in &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
-make install-man</userinput></screen></para>
+make install-man</command></userinput></screen>
 
 </sect2>
Index: basicnet/netutils/traceroute/traceroute-intro.xml
===================================================================
--- basicnet/netutils/traceroute/traceroute-intro.xml	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netutils/traceroute/traceroute-intro.xml	(revision 6998c44a92fbea3aa77c715eea92f608764618aa)
@@ -1,15 +1,24 @@
 <sect2>
-<title>Introduction to traceroute</title>
+<title>Introduction to <application>Traceroute</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&traceroute-download-http;"/>
-Download location (FTP):        <ulink url="&traceroute-download-ftp;"/>
-Version used:                   &traceroute-version;
-Package size:                   &traceroute-size;
-Estimated Disk space required:  &traceroute-buildsize;</screen>
+<para>The <application>Traceroute</application> package contains a program 
+which is used to display the network route that packets take to reach a 
+specified host. This is a standard network troubleshooting tool. If you find 
+yourself unable to connect to another system, traceroute can help pinpoint 
+the problem.</para>
 
-<para>The traceroute package contains the traceroute program, which is used 
-to display the network route that packets take to reach a specified host. This 
-is a standard network troubleshooting tool. If you find yourself unable to 
-connect to another system, traceroute can help pinpoint the problem.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&traceroute-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&traceroute-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &traceroute-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&traceroute-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&traceroute-time;</para></listitem></itemizedlist>
+</sect3>
+
 
 </sect2>
Index: basicnet/netutils/traceroute/traceroute.ent
===================================================================
--- basicnet/netutils/traceroute/traceroute.ent	(revision 23e6faf8620f52d99bbb3b242ca4b99da2a8bcdd)
+++ basicnet/netutils/traceroute/traceroute.ent	(revision 6998c44a92fbea3aa77c715eea92f608764618aa)
@@ -9,2 +9,3 @@
 <!ENTITY traceroute-download-ftp "ftp://ftp.ee.lbl.gov/traceroute.tar.gz">
 <!ENTITY traceroute-size "35 KB">
+<!ENTITY traceroute-time "">
