Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ basicnet/basicnet.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -7,7 +7,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/textweb/textweb.xml"/>  
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netprogs/netprogs.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netutils/netutils.xml"/>  
 
-
-&basicnet-netutils;
 &basicnet-mailnews;
 
Index: basicnet/netutils/bind-utils.xml
===================================================================
--- basicnet/netutils/bind-utils.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ basicnet/netutils/bind-utils.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -1,10 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY bind-download-http   "http://gd.tuwien.ac.at/infosys/servers/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+  <!ENTITY bind-download-ftp    "ftp://ftp.isc.org/isc/bind9/&bind-version;/bind-&bind-version;.tar.gz">
+  <!ENTITY bind-size            "4.4 MB">
+  <!ENTITY bind-utils-buildsize "47 MB">
+  <!ENTITY bind-utils-time      "0.54 SBU">
+]>
+
 <sect1 id="bind-utils" xreflabel="BIND Utilities-&bind-version;">
 <?dbhtml filename="bind-utils.html"?>
 <title>BIND Utilities-&bind-version;</title>
 
-&bind-utils-intro;
-&bind-utils-inst;
-&bind-utils-exp;
-&bind-utils-desc;
+<sect2>
+<title>Introduction to <application><acronym>BIND</acronym> Utilities</application></title>
+
+<para><application><acronym>BIND</acronym> Utilities</application> is not a 
+separate package, it is a collection of the client side programs that are 
+included with <application><xref linkend="bind"/></application>. The 
+<application><acronym>BIND</acronym></application> package includes client 
+side programs such as <command>nslookup</command>, <command>dig</command> and 
+<command>host</command>. If you install <application><acronym>BIND</acronym>
+</application> server, these programs will be installed automatically. This 
+section is for those users who don't need the complete
+<application><acronym>BIND</acronym></application> server, but need these 
+client side applications.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&bind-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&bind-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &bind-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&bind-utils-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&bind-utils-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>BIND</acronym> Utilities</application></title>
+
+<para>Install <application><acronym>BIND</acronym> Utilities</application> by 
+running the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make -C lib/dns &amp;&amp;
+make -C lib/isc &amp;&amp;
+make -C bin/dig &amp;&amp;
+make -C bin/dig install</userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><command>make -C lib/...</command>: This command  builds the libraries that are needed for the client programs.</para>
+
+<para><command>make -C bin/dig</command>: This command  builds the client programs.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>BIND</acronym> Utilities</application> package 
+contains <command>dig</command>, <command>host</command> and
+<command>nslookup</command>.</para>
+
+</sect2>
 
 </sect1>
Index: basicnet/netutils/netutils.xml
===================================================================
--- basicnet/netutils/netutils.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ basicnet/netutils/netutils.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -1,13 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
 <chapter id="basicnet-netutils">
 <?dbhtml filename="netutils.html"?>
 <title>Basic Networking Utilities</title>
 
-<para>This chapter contains some tools that come in handy when the
-network needs investigating.</para>
+<para>This chapter contains some tools that come in handy when the network
+needs investigating.</para>
 
-&traceroute;
-&nmap;
-&whois;
-&bind-utils;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="traceroute.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nmap.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whois.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bind-utils.xml"/>  
 
 </chapter>
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ basicnet/netutils/nmap.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -1,9 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY nmap-download-http "http://download.insecure.org/nmap/dist/nmap-&nmap-version;.tar.bz2">
+  <!ENTITY nmap-download-ftp  " ">
+  <!ENTITY nmap-size          "1.2 MB">
+  <!ENTITY nmap-buildsize     "11 MB">
+  <!ENTITY nmap-time          "0.36 SBU">
+]>
+
 <sect1 id="nmap" xreflabel="Nmap-&nmap-version;">
 <?dbhtml filename="nmap.html"?>
 <title>Nmap-&nmap-version;</title>
 
-&nmap-intro;
-&nmap-inst;
-&nmap-desc;
+<sect2>
+<title>Introduction to <application>Nmap</application></title>
+
+<para><application>Nmap</application> is a utility for network exploration and 
+security auditing. It supports ping scanning, port scanning and
+<acronym>TCP</acronym>/<acronym>IP</acronym>
+fingerprinting.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&nmap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&nmap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nmap-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &nmap-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &nmap-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>Nmap</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/>, <xref linkend="pcre"/>,
+<xref linkend="GTK"/> (for building the graphical front-end) and
+<xref linkend="libpcap"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Nmap</application></title>
+
+<para>Install <application>Nmap</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Nmap</application> package contains
+<command>nmap</command> and optionally <command>nmapfe</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>nmap</title>
+<para><command>nmap</command> is a utility for network exploration and
+security auditing. It supports ping scanning, port scanning and
+<acronym>TCP</acronym>/<acronym>IP</acronym> fingerprinting.</para></sect3>
+
+<sect3><title>nmapfe</title>
+<para><command>nmapfe</command> is the graphical front end for
+nmap.</para></sect3>
+</sect2>
 
 </sect1>
Index: basicnet/netutils/traceroute.xml
===================================================================
--- basicnet/netutils/traceroute.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ basicnet/netutils/traceroute.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -1,10 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY traceroute-download-http "http://gd.tuwien.ac.at/platform/sun/packages/solaris/freeware/SOURCES/traceroute-&traceroute-version;.tar.gz">
+  <!ENTITY traceroute-download-ftp  "ftp://ftp.ee.lbl.gov/traceroute-&traceroute-version;.tar.gz">
+  <!ENTITY traceroute-size          "73 KB">
+  <!ENTITY traceroute-buildsize     "464 KB">
+  <!ENTITY traceroute-time          "0.02 SBU">
+]>
+
 <sect1 id="traceroute" xreflabel="Traceroute-&traceroute-version;">
 <?dbhtml filename="traceroute.html"?>
 <title>Traceroute-&traceroute-version;</title>
 
-&traceroute-intro;
-&traceroute-inst;
-&traceroute-exp;
-&traceroute-desc;
+<sect2>
+<title>Introduction to <application>Traceroute</application></title>
+
+<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>
+
+<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>
+
+<sect2>
+<title>Installation of <application>Traceroute</application></title>
+
+<para>Install <application>Traceroute</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>mv 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</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<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><command>make install</command>: Installs <command>traceroute</command> 
+with <acronym>SUID</acronym> set to  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 <acronym>SUID</acronym> bit in <command>traceroute</command>'s file 
+permissions with the command:</para>
+<screen><command>chmod 0755 /usr/sbin/traceroute</command></screen>
+
+<para>The risk is that if a security problem such as a buffer overflow was 
+ever found in the <application>Traceroute</application> code, a regular user 
+on your system could gain root access if the program is
+<acronym>SUID</acronym> root. Of course, removing 
+the <acronym>SUID</acronym> permission 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>Our aim is to be completely <acronym>FHS</acronym> compliant, so if 
+you do leave the <command>traceroute</command> binary
+<acronym>SUID</acronym> root, then you 
+should move <filename>traceroute</filename> to <filename>/usr/bin</filename> 
+with the following command:</para>
+<screen><command>mv /usr/sbin/traceroute /usr/bin</command></screen>
+
+<para>This ensures that the binary is in the path for non-root users.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Traceroute</application> package contains <userinput>traceroute</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>traceroute</title>
+<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 (gateways) along the way.</para>
+</sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ basicnet/netutils/whois.xml	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -1,9 +1,65 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY whois-download-http "http://www.linux.it/~md/software/whois_&whois-version;.tar.gz">
+  <!ENTITY whois-download-ftp  " ">
+  <!ENTITY whois-size          "34 KB">
+  <!ENTITY whois-buildsize     "328 KB">
+  <!ENTITY whois-time          "0.01 SBU">
+]>
+
 <sect1 id="whois" xreflabel="Whois-&whois-version;">
 <?dbhtml filename="whois.html"?>
 <title>Whois-&whois-version;</title>
 
-&whois-intro;
-&whois-inst;
-&whois-desc;
+<sect2>
+<title>Introduction to <application>Whois</application></title>
+
+<para><application>Whois</application> is a client-side application which 
+queries the whois directory service for information pertaining to a particular 
+domain name. <!--Note that you already have this program from your LFS
+installation, it can handle COM, NET and EDU queries. You will need
+this application for any other domains. --></para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&whois-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&whois-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &whois-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &whois-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &whois-time;</para></listitem></itemizedlist>
+</sect3>
+
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Whois</application></title>
+
+<para>Install <application>Whois</application> by running the following commands:</para>
+
+<screen><userinput><command>make &amp;&amp;
+make prefix=/usr install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Whois</application> package contains <command>whois</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>whois</title>
+<para><command>whois</command> is a client-side application which queries the 
+whois directory service for information pertaining to a particular domain name.
+</para></sect3>
+
+</sect2>
 
 </sect1>
Index: general.ent
===================================================================
--- general.ent	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
+++ general.ent	(revision 3bba7e231dbdb93feb4c5a3169aa5e89390fce5c)
@@ -22,69 +22,73 @@
 <!-- Part II -->
 <!-- Chapter 4 -->
-<!ENTITY cracklib-version  "2.7">   
-<!ENTITY Linux_PAM-version "0.77">  
-<!ENTITY shadow-version    "4.0.4.1">  
-<!ENTITY iptables-version  "1.2.9"> 
-<!ENTITY gnupg-version     "1.2.4">  
-<!ENTITY tripwire-version  "2.3.1-2">   
-<!ENTITY heimdal-version   "0.6.2">   
-<!ENTITY mitkrb-version    "1.3.3"> 
-
-
-<!-- Chapter 5 -->
-<!ENTITY reiser-version    "3.6.14"> 
-<!ENTITY xfsprogs-version  "2.6.13">
-
-<!-- Chapter 6 -->
-<!ENTITY vim-version       "6.2">  
-<!ENTITY emacs-version     "21.3">  
-<!ENTITY nano-version      "1.2.3">  
-<!ENTITY joe-version       "3.0"> 
-
-<!-- Chapter 7 -->
-<!ENTITY ash-version       "0.4.0"> 
-<!ENTITY tcsh-version      "6.13.00">  
-<!ENTITY zsh-version       "4.2.0">        
-
-<!-- Part III -->
-
-<!-- Part IV -->
-
-<!-- Chapter 13 -->
-<!ENTITY ppp-version       "2.4.2"> 
-<!ENTITY wvdial-version    "1.53"> 
-
-<!-- Chapter 14 -->
-<!ENTITY dhcp-version      "3.0pl2"> 
-<!ENTITY dhcpcd-version    "1.3.22-pl4">   
-
-<!-- Chapter 15 -->
-<!ENTITY pppoe-version     "3.5"> 
-
-<!-- Chapter 16 -->
-<!ENTITY curl-version      "7.11.2"> 
-<!ENTITY wvstreams-version "3.70">  
-<!ENTITY gnet-version      "2.0.5">   
-<!ENTITY libsoup-version   "1.99.28"> 
-
-<!-- Chapter 17 -->
-<!ENTITY Links-version     "2.1pre14">  
-<!ENTITY lynx-version      "2.8.5">
-<!ENTITY w3m-version       "0.4.2"> 
-
-<!-- Chapter 18 -->
-<!ENTITY ncftp-version     "3.1.7"> 
-<!ENTITY openssh-version   "3.8.1p1"> 
-<!ENTITY rsync-version     "2.6.2"> 
-<!ENTITY cvs-version       "1.11.16">  
-<!ENTITY wget-version      "1.9.1">  
+<!ENTITY cracklib-version    "2.7">   
+<!ENTITY Linux_PAM-version   "0.77">  
+<!ENTITY shadow-version      "4.0.4.1">  
+<!ENTITY iptables-version    "1.2.9"> 
+<!ENTITY gnupg-version       "1.2.4">  
+<!ENTITY tripwire-version    "2.3.1-2">   
+<!ENTITY heimdal-version     "0.6.2">   
+<!ENTITY mitkrb-version      "1.3.3"> 
+                            
+                            
+<!-- Chapter 5 -->          
+<!ENTITY reiser-version      "3.6.14"> 
+<!ENTITY xfsprogs-version    "2.6.13">
+                            
+<!-- Chapter 6 -->          
+<!ENTITY vim-version         "6.2">  
+<!ENTITY emacs-version       "21.3">  
+<!ENTITY nano-version        "1.2.3">  
+<!ENTITY joe-version         "3.0"> 
+                            
+<!-- Chapter 7 -->          
+<!ENTITY ash-version         "0.4.0"> 
+<!ENTITY tcsh-version        "6.13.00">  
+<!ENTITY zsh-version         "4.2.0">        
+                            
+<!-- Part III -->           
+                            
+<!-- Part IV -->            
+                            
+<!-- Chapter 13 -->         
+<!ENTITY ppp-version         "2.4.2"> 
+<!ENTITY wvdial-version      "1.53"> 
+                            
+<!-- Chapter 14 -->         
+<!ENTITY dhcp-version        "3.0pl2"> 
+<!ENTITY dhcpcd-version      "1.3.22-pl4">   
+                            
+<!-- Chapter 15 -->         
+<!ENTITY pppoe-version       "3.5"> 
+                            
+<!-- Chapter 16 -->         
+<!ENTITY curl-version        "7.11.2"> 
+<!ENTITY wvstreams-version   "3.70">  
+<!ENTITY gnet-version        "2.0.5">   
+<!ENTITY libsoup-version     "1.99.28"> 
+                            
+<!-- Chapter 17 -->         
+<!ENTITY Links-version       "2.1pre14">  
+<!ENTITY lynx-version        "2.8.5">
+<!ENTITY w3m-version         "0.4.2"> 
+                            
+<!-- Chapter 18 -->         
+<!ENTITY ncftp-version       "3.1.7"> 
+<!ENTITY openssh-version     "3.8.1p1"> 
+<!ENTITY rsync-version       "2.6.2"> 
+<!ENTITY cvs-version         "1.11.16">  
+<!ENTITY wget-version        "1.9.1">  
 <!ENTITY tcpwrappers-version "7.6">  
-<!ENTITY portmap-version   "5beta">    
-<!ENTITY inetutils-version "1.4.2">  
-<!ENTITY nfs-utils-version "1.0.6">   
-<!ENTITY ncpfs-version     "2.2.4"> 
-<!ENTITY ntp-version       "4.2.0">  
-
-<!-- Chapter 19 -->
+<!ENTITY portmap-version     "5beta">    
+<!ENTITY inetutils-version   "1.4.2">  
+<!ENTITY nfs-utils-version   "1.0.6">   
+<!ENTITY ncpfs-version       "2.2.4"> 
+<!ENTITY ntp-version         "4.2.0">  
+                            
+<!-- Chapter 19 -->         
+<!ENTITY traceroute-version  "1.4a12"> 
+<!ENTITY nmap-version        "3.50">  
+<!ENTITY whois-version       "4.6.14">
+<!ENTITY bind-version        "9.2.3"> 
 
 
