Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/basicnet.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -6,7 +6,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netlibs/netlibs.xml"/>  
 <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"/>  
 
 
-&basicnet-netprogs;
 &basicnet-netutils;
 &basicnet-mailnews;
Index: basicnet/netprogs/cvs.xml
===================================================================
--- basicnet/netprogs/cvs.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/cvs.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,10 +1,99 @@
+<?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 cvs-download-http "https://ccvs.cvshome.org/files/documents/19/152/cvs-&cvs-version;.tar.bz2">
+  <!ENTITY cvs-download-ftp  " ">
+  <!ENTITY cvs-size          "2.7 MB">
+  <!ENTITY cvs-buildsize     "25.4 MB">
+  <!ENTITY cvs-time          "0.31 SBU">
+]>
+
 <sect1 id="cvs" xreflabel="CVS-&cvs-version;">
 <?dbhtml filename="cvs.html"?>
 <title>CVS-&cvs-version;</title>
 
-&cvs-intro;
-&cvs-inst;
-&cvs-config;
-&cvs-desc;
+<sect2>
+<title>Introduction to <application><acronym>CVS</acronym></application></title>
+
+<para><application><acronym>CVS</acronym></application> is the Concurrent 
+Versioning System. This is a version control system useful for projects
+using a central repository to hold files and then track all changes made to 
+those files. These instructions install the client used to manipulate the
+repository, creation of a repository is covered at <xref linkend="cvsserver"/>.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&cvs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&cvs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &cvs-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &cvs-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &cvs-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>CVS</acronym></application></title>
+
+<para>Install <application><acronym>cvs</acronym></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>Configuring <application><acronym>CVS</acronym></application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.cvsrc</filename>, <filename>~/.cvswrappers</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para><filename>~/.cvsrc</filename> is the main
+<application><acronym>CVS</acronym></application> configuration file.
+This file is used by users to specify defaults for different <command>cvs
+</command> commands, for example to make all <command>cvs diff</command> 
+commands run with <userinput>-u</userinput>, a user would add <userinput>
+diff -u</userinput> to their <filename>.cvsrc</filename> file.</para>
+
+<para><filename>~/.cvswrappers</filename> specifies wrappers to be used in 
+addition to those specified in the <filename>CVSROOT/cvswrappers</filename> 
+file in the repository.</para>
+
+<para><filename>~/.cvspass</filename> can hold passwords to complete
+logins to servers.</para></sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>CVS</acronym></application> package contains 
+<command>cvs</command>, <command>cvsbug</command> and <command>rcs2log</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>cvs</title>
+<para>This is the main program file for the concurrent versioning 
+system.</para></sect3>
+
+<sect3><title>cvsbug</title>
+<para>This is used to send problem reports about
+<application><acronym>CVS</acronym></application> to a central
+support site.</para></sect3>
+
+<sect3><title>rcs2log</title>
+<para><acronym>RCS</acronym> to Change Log generator.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/inetutils.xml
===================================================================
--- basicnet/netprogs/inetutils.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/inetutils.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,10 +1,161 @@
+<?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 inetutils-download-http "http://gd.tuwien.ac.at/gnu/gnusrc/inetutils/inetutils-&inetutils-version;.tar.gz">
+  <!ENTITY inetutils-download-ftp  "ftp://ftp.gnu.org/gnu/inetutils/inetutils-&inetutils-version;.tar.gz">
+  <!ENTITY inetutils-size          "1019 KB">
+  <!ENTITY inetutils-buildsize     "13 MB">
+  <!ENTITY inetutils-time          "0.30 SBU">
+]>
+
 <sect1 id="inetutils" xreflabel="Inetutils-&inetutils-version;">
 <?dbhtml filename="inetutils.html"?>
 <title>Inetutils-&inetutils-version;</title>
 
-&inetutils-intro;
-&inetutils-inst;
-&inetutils-exp;
-&inetutils-desc;
+<sect2>
+<title>Introduction to <application>Inetutils</application></title>
+
+<para>The <application>Inetutils</application> package contains network clients 
+and servers.</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>
+
+<sect3><title><application>Inetutils</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="Linux_PAM"/>, and <xref linkend="tcpwrappers"/></para></sect4>
+</sect3>
+
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Inetutils</application></title>
+
+<para>Install <application>Inetutils</application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --disable-syslogd \
+    --libexecdir=/usr/sbin --infodir=/usr/share/info \
+    --sysconfdir=/etc --localstatedir=/var \
+    --mandir=/usr/share/man &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+mv /usr/bin/ping /bin</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><option>--disable-syslogd</option>: This switch  prevents
+<application>Inetutils</application> installing a System Log Daemon, which is 
+installed in the <acronym>LFS</acronym> Book.</para>
+
+<para><option>--with-wrap</option>: This switch makes <application>Inetutils
+</application> compile against <application>tcp-wrappers</application>. Add
+this option if you want to utilize <application>tcp-wrappers</application>.
+</para>
+
+<para><option>--disable-whois</option>: This switch will prevent
+<application>Inetutils</application> installing a whois client, since the
+included whois client is out of date. Add this option if you plan on installing
+<xref linkend="whois"/>.</para>
+
+<para><option>--with-pam</option>: This switch makes <application>Inetutils
+</application> link against <application>Linux-<acronym>PAM</acronym></application> libraries.
+Add this option if you want to utilize <acronym>PAM</acronym>.
+</para>
+
+<para><option>--disable-servers</option>: Some of the servers included with
+<application>Inetutils</application> are insecure in nature and in some cases
+better alternatives exist. You can choose this switch to enable only the
+servers you need, avoiding the  installation of unneeded servers.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Inetutils</application> package contains network clients 
+and servers.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ftp</title>
+<para><command>ftp</command> is a ARPANET file transfer client.</para></sect3>
+
+<sect3><title>logger</title>
+<para><command>logger</command> make entries in the system log.</para></sect3>
+
+<sect3><title>ping</title>
+<para><command>ping</command> sends <acronym>ICMP</acronym> ECHO_REQUEST 
+packets to network hosts.</para></sect3>
+
+<sect3><title>rcp</title>
+<para><command>rcp</command> is a remote file copy client.</para></sect3>
+
+<sect3><title>rlogin</title>
+<para><command>rlogin</command> is a remote login client.</para></sect3>
+
+<sect3><title>rsh</title>
+<para><command>rsh</command> is a remote shell client.</para></sect3>
+
+<sect3><title>syslogd</title>
+<para><command>syslogd</command> logs systems messages.</para></sect3>
+
+<sect3><title>talk</title>
+<para><command>talk</command> allows communication between users.</para></sect3>
+
+<sect3><title>telnet</title>
+<para><command>telnet</command> is a user interface to the TELNET protocol.</para></sect3>
+
+<sect3><title>tftp</title>
+<para><command>tftp</command> is an Internet Trivial File Transfer
+Protocol client.</para></sect3>
+
+<sect3><title>whois</title>
+<para><command>whois</command> is a client for the whois directory service.</para></sect3>
+
+<sect3><title>ftpd</title>
+<para><command>ftpd</command> is a DARPA Internet File Transfer Protocol server.</para></sect3>
+
+<sect3><title>inetd</title>
+<para><command>inetd</command> is a Internet super-server.</para></sect3>
+
+<sect3><title>rexecd</title>
+<para><command>rexcd</command> is a remote execution server.</para></sect3>
+
+<sect3><title>rlogind</title>
+<para><command>rlogind</command> is a remote login server.</para></sect3>
+
+<sect3><title>rshd</title>
+<para><command>rshd</command> is a remote shell server.</para></sect3>
+
+<sect3><title>talkd</title>
+<para><command>talkd</command> is a remote user communication server.</para></sect3>
+
+<sect3><title>telnetd</title>
+<para><command>telnetd</command> is a DARPA TELNET protocol server.</para></sect3>
+
+<sect3><title>tftpd</title>
+<para><command>tftpd</command> is an Internet Trivial File Transfer Protocol server.</para></sect3>
+
+<sect3><title>uucpd</title>
+<para><command>uucpd</command> is the server for supporting
+<acronym>UUCP</acronym> connections over networks.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/ncftp.xml
===================================================================
--- basicnet/netprogs/ncftp.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/ncftp.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,11 +1,148 @@
+<?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 ncftp-download-http "http://gd.tuwien.ac.at/infosys/clients/ftp/ncftp/ncftp-&ncftp-version;-src.tar.bz2">
+  <!ENTITY ncftp-download-ftp  "ftp://ftp.ncftp.com/ncftp/ncftp-&ncftp-version;-src.tar.bz2">
+  <!ENTITY ncftp-size          "389 KB">
+  <!ENTITY ncftp-buildsize     "5.2 MB">
+  <!ENTITY ncftp-time          "0.38 SBU">
+]>
+
 <sect1 id="ncftp" xreflabel="NcFTP-&ncftp-version;">
 <?dbhtml filename="ncftp.html"?>
 <title>NcFTP-&ncftp-version;</title>
 
-&ncftp-intro;
-&ncftp-inst;
-&ncftp-exp;
-&ncftp-config;
-&ncftp-desc;
+<sect2>
+<title>Introduction to <application>Nc<acronym>FTP</acronym></application></title>
+
+<para>The <application>Nc<acronym>FTP</acronym></application> package contains a powerful and 
+flexible interface to the Internet standard File Transfer Protocol.  It is 
+intended to replace or supplement the stock <command>ftp</command> program.
+</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&ncftp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&ncftp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ncftp-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&ncftp-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&ncftp-time;</para></listitem></itemizedlist>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Nc<acronym>FTP</acronym></application></title>
+
+<para>There are two ways to build <application>Nc<acronym>FTP</acronym></application>.  The first 
+(and optimal) way builds most of the functionality as a shared library and 
+then builds and installs the program linked against this library.  The second 
+method simply links all of the functionality into the binary statically.  This
+doesn't make the dynamic library available for linking by other
+applications.  You need to choose which method best suits you.  Note
+that the second method does <emphasis>not</emphasis> create an entirely
+statically linked binary; only the <filename class="libraryfile">libncftp</filename> parts are 
+statically linked in, in this case. Be aware that building and using the shared 
+library is covered by the Clarified Artistic License; however, developing 
+applications that utilize the shared library is subject to a different license.
+</para>
+
+<para>To install <application>Nc<acronym>FTP</acronym></application> using the first (and optimal) 
+method, run the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make -C libncftp shared &amp;&amp;
+make -C libncftp soinstall &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<para>To install <application>Nc<acronym>FTP</acronym></application> using the second method (with 
+the <filename class="libraryfile">libncftp</filename> functionality linked in statically) run the 
+following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><screen><command>make -C libncftp shared  
+make -C libncftp soinstall</command></screen>
+These commands make and install the dynamic library <filename
+class="libraryfile">libncftp</filename> which is then used to link
+against when compiling the main program.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Nc<acronym>FTP</acronym></application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.ncftp/*</filename>; especially
+<filename>~/.ncftp/prefs_v3</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Most <application>Nc<acronym>FTP</acronym></application> configuration is done while in the 
+program, and the configuration files are dealt with automatically.  One 
+exception to this is <filename>~/.ncftp/prefs_v3</filename>.  There are various 
+options to alter in there, including:</para>
+
+<para><screen><userinput>yes-i-know-about-NcFTPd=yes</userinput></screen> 
+This disables the splash screen advertising the
+<application>NcFTPd</application> server.</para>
+
+<para>There are other options in the <filename>prefs_v3</filename> file.  Most of these are self-explanatory.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Nc<acronym>FTP</acronym></application> package
+contains <filename class="libraryfile">libncftp</filename>,
+<command>ncftp</command>, <command>ncftpbatch
+</command>, <command>ncftpbookmarks</command>,
+<command>ncftpget</command>, <command>ncftpls</command>,
+<command>ncftpput</command> and <command>ncftpspooler</command>.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ncftp</title>
+<para>A browser program for File Transfer Protocol.</para></sect3>
+
+<sect3><title>ncftpbatch</title>
+<para>Individual batch <acronym>FTP</acronym> job processor.</para></sect3>
+
+<sect3><title>ncftpbookmarks</title>
+<para><application>NcFTP</application> Bookmark Editor
+(<application>NCurses</application>-based).</para></sect3>
+
+<sect3><title>ncftpget</title>
+<para>Internet file transfer program for scripts.</para></sect3>
+
+<sect3><title>ncftpls</title>
+<para>Internet file transfer program for scripts.</para></sect3>
+
+<sect3><title>ncftpput</title>
+<para>Internet file transfer program for scripts.</para></sect3>
+
+<sect3><title>ncftpspooler</title>
+<para>Global batch <acronym>FTP</acronym> job processor daemon.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/ncpfs.xml
===================================================================
--- basicnet/netprogs/ncpfs.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/ncpfs.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,11 +1,194 @@
+<?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 ncpfs-download-http "http://platan.vc.cvut.cz/ftp/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
+  <!ENTITY ncpfs-download-ftp  "ftp://platan.vc.cvut.cz/pub/linux/ncpfs/ncpfs-&ncpfs-version;.tar.gz">
+  <!ENTITY ncpfs-size          "1.6 MB">
+  <!ENTITY ncpfs-buildsize     "30 MB">
+  <!ENTITY ncpfs-time          "0.52 SBU">
+]>
+
 <sect1 id="ncpfs" xreflabel="NCPFS-&ncpfs-version;">
 <?dbhtml filename="ncpfs.html"?>
 <title>NCPFS-&ncpfs-version;</title>
 
-&ncpfs-intro;
-&ncpfs-inst;
-&ncpfs-exp;
-&ncpfs-config;
-&ncpfs-desc;
+<sect2>
+<title>Introduction to <application><acronym>NCPFS</acronym></application></title>
+
+<para>The <application><acronym>NCPFS</acronym></application> package
+contains client and administration tools for use with Novell
+networks.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&ncpfs-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&ncpfs-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ncpfs-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&ncpfs-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&ncpfs-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>NCPFS</acronym></application> dependencies</title>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="Linux_PAM"/> and
+<xref linkend="php"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>NCPFS</acronym></application></title>
+
+<para>Install <application><acronym>NCPFS</acronym></application> by running the following commands:</para>
+
+<screen><userinput>./configure --prefix="" --includedir=/usr/include \
+    --mandir=/usr/share/man --datadir=/usr/share &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+make install-dev</userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--prefix=""</parameter>:
+installs binaries on the root partition so that they are available at
+boot time.  This may not be ideal for all systems.  If
+<filename class="directory">/usr</filename> is mounted locally,
+<parameter>--prefix=/usr</parameter> may be a better option.</para>
+
+<para><parameter>--includedir=/usr/include</parameter>: Tells configure
+to look in <filename class="directory">/usr/include</filename> for header files.  It also
+tells make to install <application>NCPFS</application>'s headers here.</para>
+
+<para><parameter>--mandir=/usr/share/man</parameter>:  installs the man
+pages in the correct location.</para>
+
+<para><parameter>--datadir=/usr/share</parameter>:  correctly installs the 
+locale files to <filename class="directory">/usr/share</filename>.</para>
+
+<note><para>If you do not need to use the <acronym>IPX</acronym> protocol, or you use a different
+<acronym>IPX</acronym> package, you can optionally pass <parameter>--disable-ipx</parameter>
+and/or <parameter>--disable-ipx-tools</parameter> to the configure
+script to disable these options.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>NCPFS</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>~/.nwclient</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>A config file <filename>~/.nwclient</filename> should be placed
+in the home directory of each user that intends to use <application>ncpfs</application>. The permissions on this file should be set to 600, for obvious 
+security reasons.  The configuration file should contain a single line
+per server that the user will use.  Each line should contain
+the server name, the user name, and optionally the password.  Below is a
+sample <filename>.nwclient</filename> file.</para>
+
+<screen><userinput># Begin example <filename>~/.nwclient</filename> config file
+
+Server1/User1 Password
+Server2/User1 
+Server2/Guest1 -
+
+# End example .nwclient config file</userinput></screen>
+
+<para>The syntax for the <filename>.nwclient</filename> file is simple,
+<userinput>server_name/user_name password</userinput>.  Be extremely
+careful when creating or editing this file as the client utilities are
+very picky about syntax.  There should always be a space immediately
+after the username.  If this space is substituted by a tab or multiple 
+spaces, you will not get the expected results when attempting to use 
+the <application>NCPFS</application> tools.  If no password is supplied, 
+the client utilities will ask for a password when it is needed.  If no 
+password is needed, for instance when using a guest account, a single '-' 
+should be put in place of a password.</para>
+
+<para>It should be noted that the ncpmount is not intended to mount
+individual volumes because each mount point creates a separate client
+connection to the Novell server.  Mounting each individual volume
+separately would be unwise, as mounting all volumes on a server 
+under one mount point uses only one client connection.</para>
+
+<para>If you need to set up the <acronym>IPX</acronym> protocol at boot, 
+you can install the
+<filename>/etc/sysconfig/network-devices/services/ipx</filename> 
+network service script included with the 
+<xref linkend="intro-important-bootscripts"/> package.</para>
+
+<screen><userinput><command>make install-service-ipx</command></userinput></screen>
+
+<para>Next install the configurations script,
+<filename>ifconfig.ipx0</filename>.  The configuration assumes 
+<acronym>IPX</acronym> will be set up on 
+<emphasis role="strong">eth0</emphasis>  
+and the network frame type is 802.2.  You should confirm that these are 
+the correct settings and adjust as necessary.</para>
+
+<para><emphasis>Note</emphasis>: This will overwrite any existing file.</para>
+
+<screen><userinput><command>cat &gt; /etc/sysconfig/network-devices/ifconfig.ipx0 &lt;&lt; "EOF"</command>
+ONBOOT=yes
+SERVICE=ipx
+IPXDEV=eth0
+FRAME=802.2
+<command>EOF</command></userinput></screen>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<itemizedlist>
+
+<listitem><para><emphasis>Client Utilities:</emphasis> <command> 
+ncpmount</command>, <command>ncpumountt</command>,
+<command>nprintt</command>, <command>nsendt</command>,
+<command>nwpasswdt</command>, <command>nwsfindt</command>,
+<command>pqlistt</command>, <command>pqrmt</command>, <command> 
+pqstatt</command> and <command>slist</command>.</para></listitem>
+
+<listitem><para><emphasis>Server Admin Utilities:</emphasis> 
+<command>ncopyt</command>, <command>nwbocreatet</command>,
+<command>nwbolst</command>, <command>nwbopropst</command>,
+<command>nwbormt</command>, <command>nwbpaddt</command>,
+<command>nwbpcreatet</command>, <command>nwbprmt</command>,
+<command>nwbpsett</command>, <command>nwbpvaluest</command>,
+<command>nwdirt</command>, <command>nwdpvaluest</command>,
+<command>nwfsctrlt</command>, <command>nwfsinfot</command>,
+<command>nwfstimet</command>, <command>nwgrantt</command>,
+<command>nwpurget</command>, <command>nwrevoket</command>,
+<command>nwrightst</command>, <command>nwtrusteet</command>,
+<command>nwtrustee2t</command>, <command>nwuserlistt</command>,
+ and <command>nwvolinfo</command>.</para></listitem>
+
+<listitem><para><emphasis><acronym>IPX</acronym> Interface Utilities:</emphasis> 
+<command>ipx_cmdt</command>, <command>ipx_configuret</command>,
+<command>ipx_interfacet</command>, <command>ipx_internal_nett</command>
+and <command>ipx_route</command>.</para></listitem>
+
+<listitem><para><emphasis>Other Utilities:</emphasis> 
+<command>ncpmap</command> and <command>nwauth</command>.</para></listitem>
+
+</itemizedlist>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/netprogs.xml
===================================================================
--- basicnet/netprogs/netprogs.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/netprogs.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,2 +1,9 @@
+<?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-netprogs">
 <?dbhtml filename="netprogs.html"?>
@@ -8,14 +15,15 @@
 have running on your machine.</para>
 
-&ncftp;
-&basicnet-netprogs-opensshclient;
-&basicnet-netprogs-rsyncclient;
-&cvs;
-&wget;
-&tcpwrappers;
-&portmap;
-&inetutils;
-&nfs-utils;
-&ncpfs;
-&ntp;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncftp.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="openssh-client.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="rsync-client.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cvs.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wget.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tcpwrappers.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="portmap.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="inetutils.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="nfs-utils.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncpfs.xml"/>  
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ntp.xml"/>  
+
 </chapter>
Index: basicnet/netprogs/nfs-utils.xml
===================================================================
--- basicnet/netprogs/nfs-utils.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/nfs-utils.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,10 +1,182 @@
+<?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 nfs-utils-download-http "http://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
+  <!ENTITY nfs-utils-download-ftp  "ftp://ftp.kernel.org/pub/linux/utils/nfs/nfs-utils-&nfs-utils-version;.tar.gz">
+  <!ENTITY nfs-utils-size          "336 KB">
+  <!ENTITY nfs-utils-buildsize     "8 MB">
+  <!ENTITY nfs-utils-time          "">
+]>
+
 <sect1 id="nfs-utils" xreflabel="NFS Utilities-&nfs-utils-version;">
 <?dbhtml filename="nfs-utils.html"?>
 <title>NFS Utilities-&nfs-utils-version;</title>
 
-&nfs-utils-intro;
-&nfs-utils-inst;
-&nfs-utils-config;
-&nfs-utils-desc;
+<sect2>
+<title>Introduction to <application>nfs-utils</application></title>
+
+<para>The <application>nfs-utils</application> package contains the userspace server and client
+tools necessary to use the kernel's nfs-abilities. <acronym>NFS</acronym> is a protocol that
+allows sharing file systems over the network.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&nfs-utils-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&nfs-utils-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &nfs-utils-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&nfs-utils-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&nfs-utils-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>nfs-utils</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="portmap"/></para>
+</sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Kernel Configuration</title>
+
+<para>Enable the following options in the kernel configuration
+and recompile the kernel if neccessary:</para>
+
+<screen>File systems:
+  Network File Systems:
+    NFS File System Support: M or Y
+    NFS Server Support: M or Y</screen>
+
+<para>Select the appropriate sub-options that appear when the above options
+are selected.</para>
+
+</sect2>
+
+<sect2>
+<title>Installation of nfs-utils</title>
+
+<para>Before you compile the program, you need to be sure the "nobody"
+user and "nogroup" group are available. You can add these with the
+following commands:</para>
+
+<screen><userinput><command>groupadd -g 65534 nogroup &amp;&amp;
+useradd -c nobody -d /home -g nogroup -s /bin/bash -u 65534 nobody</command></userinput></screen>
+
+<para>Install nfs-utils by running the following commands:</para>
+
+<para><screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen></para>
+
+<note><para>If your <filename>/usr</filename> directory is NFS mounted,
+you should install the executables in <filename>/sbin</filename> by passing
+an additional parameter <command>--sbindir=/sbin</command> to the above
+<command>./configure</command> command.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Configuring nfs-utils</title>
+
+<sect3><title>Server Configutation</title>
+
+<para><filename>/etc/exports</filename> contains the exported directories on NFS servers.
+Refer to the exports manual page for the syntax of this file. Also refer to the
+NFS HowTo available at <ulink url="http://nfs.sourceforge.net/nfs-howto/"/> on how to
+configure the servers and clients in a secure manner. For example, for sharing the
+<filename>/home</filename> directory over the local network, the following line may
+be added:</para>
+
+<screen><userinput>/home 192.168.0.0/255.255.0.0(rw)</userinput></screen>
+
+<para>Install the <filename>/etc/rc.d/init.d/nfs-server</filename>
+init script included in the
+<xref linkend="intro-important-bootscripts"/> package to start
+the server at boot.</para>
+
+<screen><userinput><command>make install-nfs-server</command></userinput></screen>
+
+</sect3>
+
+<sect3><title>Client Configutation</title>
+
+<para><filename>/etc/fstab</filename> contains the directories that are to be mounted
+on the client. Alternately the partitions can be mounted by using the
+<command>mount</command> command with the proper options. To mount the <filename>/home</filename>
+partition, add the following to the <filename>/etc/fstab</filename>:</para>
+
+<screen><userinput>&lt;server-name&gt;:/home /home nfs rw 0 0</userinput></screen>
+
+<para>Install the <filename>/etc/rc.d/init.d/nfs-client</filename>
+init script included in the
+<xref linkend="intro-important-bootscripts"/> package to 
+start the client services at boot.</para>
+
+<screen><userinput><command>make install-nfs-client</command></userinput></screen>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The nfs-utils package contains 
+<command>getiversion</command>,
+<command>getkversion</command>,
+<command>locktest</command>,
+<command>nlmtest</command>,
+<command>rpcdebug</command>,
+<command>rpcgen</command>,
+<command>exportfs</command>,
+<command>lockd</command>,
+<command>mountd</command>,
+<command>nfsd</command>,
+<command>nfsstat</command>,
+<command>nhfsstone</command>,
+<command>rquotad</command>,
+<command>showmount</command>,
+<command>statd</command> </para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>getiversion</title><para>No description available.</para></sect3>
+<sect3><title>getkversion</title><para>No description available.</para></sect3>
+<sect3><title>locktest</title><para>No description available.</para></sect3>
+<sect3><title>nlmtest</title><para>No description available.</para></sect3>
+<sect3><title>rpcdebug</title><para>No description available.</para></sect3>
+<sect3><title>rpcgen</title><para>No description available.</para></sect3>
+<sect3><title>exportfs</title><para><command>exportfs</command>
+maintains a list of <acronym>NFS</acronym> exported directories.</para></sect3>
+<sect3><title>lockd</title><para><command>lockd</command>
+is the <acronym>NFS</acronym> lock manager.</para></sect3>
+<sect3><title>mountd</title><para><command>mountd</command>
+is the <acronym>NFS</acronym> mount daemon which checks client-permissions.</para></sect3>
+<sect3><title>nfsd</title><para><command>nfsd</command>
+is the user-space daemon of the <acronym>NFS</acronym> service.</para></sect3>
+<sect3><title>nfsstat</title><para><command>nfsstat</command>
+prints <acronym>NFS</acronym> statistics.</para></sect3>
+<sect3><title>nhfsstone</title><para><command>nhfsstone</command>
+is the <acronym>NFS</acronym> benchmark program.</para></sect3>
+<sect3><title>rquotad</title><para><command>rquotad</command>
+is the remote quota server communicating with the
+<command>quota</command> client.</para></sect3>
+<sect3><title>showmount</title><para><command>showmount</command>
+shows mount information for an <acronym>NFS</acronym> server.</para></sect3>
+<sect3><title>statd</title><para><command>statd</command>
+is the <acronym>NFS</acronym> status monitor which implements the
+<acronym>NSM</acronym> (Network Status Monitor) <acronym>RPC</acronym> protocol.
+</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/ntp.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,10 +1,172 @@
+<?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 ntp-download-http "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-&ntp-version;.tar.gz">
+  <!ENTITY ntp-download-ftp  "ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-&ntp-version;.tar.gz">
+  <!ENTITY ntp-size          "2.4 MB">
+  <!ENTITY ntp-buildsize     "27 MB">
+  <!ENTITY ntp-time          "0.53 SBU">
+]>
+
 <sect1 id="ntp" xreflabel="NTP-&ntp-version;">
 <?dbhtml filename="ntp.html"?>
 <title>NTP-&ntp-version;</title>
 
-&ntp-intro;
-&ntp-inst;
-&ntp-config;
-&ntp-desc;
+<sect2>
+<title>Introduction to <application><acronym>NTP</acronym></application></title>
+
+<para>The <application><acronym>NTP</acronym></application> package contains a client and server
+to keep the time synchronized between various computers over a network.
+This package is the official reference implementation of the <acronym>NTP</acronym> protocol.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&ntp-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&ntp-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &ntp-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &ntp-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &ntp-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>NTP</acronym></application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="readline"/> and <xref linkend="openssl"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application><acronym>NTP</acronym></application></title>
+
+<para>Install <application><acronym>NTP</acronym></application> by running the following 
+commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --bindir=/usr/sbin \
+    --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application><acronym>NTP</acronym></application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/ntp.conf</filename></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>The following configuration file defines various <acronym>NTP</acronym>
+stratum 2 servers with open access from different continents. It also
+creates a drift file where <command>ntpd</command> stores the frequency
+offset. Since the documentation included with the package is sparse,
+visit the <acronym>NTP</acronym> website at
+<ulink url="http://www.ntp.org/"/> for more information.</para>
+
+<screen><userinput><command>cat &gt; /etc/ntp.conf &lt;&lt; "EOF"</command>
+# Africa
+server tock.nml.csir.co.za
+
+# Asia
+server ntp.shim.org
+
+# Australia
+server ntp.saard.net
+        
+# Europe
+server ntp.tuxfamily.net
+
+# North America
+server clock.psu.edu
+
+driftfile /var/cache/ntp.drift
+<command>EOF</command></userinput></screen>
+</sect3>
+
+<sect3><title>Synchronizing the time</title>
+
+<para>There are two options. Option one is to run <command>ntpd</command>
+continuously and allow it to synchronize the time in a gradual manner. The other
+option is to run <command>ntpd</command> periodically (using cron)
+and update the time each time <command>ntpd</command> is scheduled.</para>
+
+<para>If you choose Option one, then install the 
+<filename>/etc/rc.d/init.d/ntp</filename>
+init script included in the
+<xref linkend="intro-important-bootscripts"/> package.</para>
+                                                                                                                
+<screen><userinput><command>make install-ntp</command></userinput></screen>
+
+<para>If you prefer to run ntpd periodically, add the following command to
+root's <filename>crontab</filename>:</para>
+<screen><userinput>ntpd -q</userinput></screen>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>NTP</acronym></application> package
+contains <command>ntp-wait</command>, <command>ntptrace</command>,
+<command>ntpd</command>, <command>ntpdate</command>,
+<command>ntpdc</command>, <command>ntpq</command>,
+<command>ntptime</command>, <command>tickadj</command> and
+<command>ntp-keygen</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ntp-wait</title>
+<para><command>ntp-wait</command> is useful at boot time, to delay the
+boot sequence until <command>ntpd</command> has set the
+time.</para></sect3>
+
+<sect3><title>ntptrace</title>
+<para><command>ntptrace</command> traces a chain of
+<acronym>NTP</acronym> servers back to the primary source.</para></sect3>
+
+<sect3><title>ntpd</title>
+<para><command>ntpd</command> is a NTP daemon that runs in the
+background and keeps the date and time synchronized based on response
+from configured <acronym>NTP</acronym> servers. It also functions as a
+<acronym>NTP</acronym> server.</para></sect3>
+
+<sect3><title>ntpdate</title>
+<para><command>ntpdate</command> is a client program that sets the date
+and time based on the response from an <acronym>NTP</acronym> server.
+This command is deprecated.</para></sect3>
+
+<sect3><title>ntpdc</title>
+<para><command>ntpdc</command> is used to query the
+<acronym>NTP</acronym> daemon about its current state and to request
+changes in that state.</para></sect3>
+
+<sect3><title>ntpq</title>
+<para><command>ntpq</command> is an utility program used to monitor
+<command>ntpd</command> operations and determine
+performance.</para></sect3>
+
+<sect3><title>ntptime</title>
+<para><command>ntptime</command> reads and displays time-related
+kernel variables.</para></sect3>
+
+<sect3><title>tickadj</title>
+<para><command>tickadj</command> reads, and optionally modifies,
+several timekeeping-related variables in older kernels that do not have
+support for precision timekeeping.</para></sect3>
+
+<sect3><title>ntp-keygen</title>
+<para><command>ntp-keygen</command> generates cryptographic data files
+used by the <acronym>NTP</acronym>v4 authentication and identification
+schemes.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/openssh-client.xml
===================================================================
--- basicnet/netprogs/openssh-client.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/openssh-client.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,2 +1,9 @@
+<?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;
+]>
+
 <sect1 id="basicnet-netprogs-openssh">
 <?dbhtml filename="openssh.html"?>
Index: basicnet/netprogs/portmap.xml
===================================================================
--- basicnet/netprogs/portmap.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/portmap.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,13 +1,117 @@
+<?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 portmap-download-http " ">
+  <!ENTITY portmap-download-ftp  "ftp://ftp.porcupine.org/pub/security/portmap_5beta.tar.gz">
+  <!ENTITY portmap-size          "20 KB">
+  <!ENTITY portmap-buildsize     "250 KB">
+  <!ENTITY portmap-time          "0.03 SBU">
+]>
+
 <sect1 id="portmap" xreflabel="portmap-&portmap-version;">
 <?dbhtml filename="portmap.html"?>
 <title>portmap-&portmap-version;</title>
 
-&portmap-intro;
-&portmap-inst;
-<!--
-&portmap-exp;
--->
-&portmap-config;
-&portmap-desc;
+<sect2>
+<title>Introduction to <application>portmap</application></title>
+
+<para>The <application>portmap</application> package is a more secure 
+replacement for the original SUN <application>portmap</application> package.  
+<application>Portmap</application> is used to forward <acronym>RPC</acronym>
+requests to <acronym>RPC</acronym> daemons such as <acronym>NFS</acronym>
+and <acronym>NIS</acronym>.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&portmap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&portmap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &portmap-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&portmap-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&portmap-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch: <ulink
+url="&patch-root;/portmap-5beta-compilation-fixes-2.patch"/></para></listitem>
+<listitem><para>Required patch: <ulink
+url="&patch-root;/portmap-5beta-glibc-errno-fix.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+                                                                                
+<sect3><title><application>portmap</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="tcpwrappers"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>portmap</application></title>
+
+<para>Install <application>portmap</application> with the following commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../portmap-5beta-compilation-fixes-2.patch &amp;&amp;
+patch -Np1 -i ../portmap-5beta-glibc-errno-fix.patch &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+<note><para>The above installation places executable <filename>portmap</filename>
+in <filename class="directory">/sbin</filename>. You may choose to move the file
+to <filename class="directory">/usr/sbin</filename>. If you do, remember to
+modify the bootscript.</para></note>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>portmap</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/rc.d/init.d/portmap</filename></para>
+</sect3>
+
+<sect3><title>Boot script</title>
+
+<para>Install the <filename>/etc/rc.d/init.d/portmap</filename>
+init script included in the
+<xref linkend="intro-important-bootscripts"/> package.</para>
+                                                                                                                
+<screen><userinput><command>make install-portmap</command></userinput></screen>
+
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>portmap</application> package contains
+<command>portmap</command>,
+<command>pmap_dump</command> and
+<command>pmap_set</command>.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>portmap</title>
+<para><command>portmap</command> is the <acronym>RPC</acronym> port mapper.
+</para></sect3>
+
+<sect3><title>pmap_dump</title>
+<para><command>pmap_dump</command> saves the port mapping table to an
+<acronym>ASCII</acronym> file.</para></sect3>
+
+<sect3><title>pmap_set</title>
+<para><command>pmap_set</command> restores the port mapping table from an 
+<acronym>ASCII</acronym> file.</para></sect3>
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/rsync-client.xml
===================================================================
--- basicnet/netprogs/rsync-client.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/rsync-client.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,2 +1,9 @@
+<?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;
+]>
+
 <sect1 id="basicnet-netprogs-rsync">
 <?dbhtml filename="rsync.html"?>
Index: basicnet/netprogs/tcpwrappers.xml
===================================================================
--- basicnet/netprogs/tcpwrappers.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/tcpwrappers.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,13 +1,119 @@
+<?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 tcpwrappers-download-http "http://files.ichilton.co.uk/nfs/tcp_wrappers_&tcpwrappers-version;.tar.gz">
+  <!ENTITY tcpwrappers-download-ftp  "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz">
+  <!ENTITY tcpwrappers-size          "100 KB">
+  <!ENTITY tcpwrappers-buildsize     "720 KB">
+  <!ENTITY tcpwrappers-time          "0.16 SBU">
+]>
+
 <sect1 id="tcpwrappers" xreflabel="tcpwrappers-&tcpwrappers-version;">
 <?dbhtml filename="tcpwrappers.html"?>
 <title>tcpwrappers-&tcpwrappers-version;</title>
 
-&tcpwrappers-intro;
-&tcpwrappers-inst;
-<!-- 
-&tcpwrappers-exp;
--->
-&tcpwrappers-config;
-&tcpwrappers-desc;
+<sect2>
+<title>Introduction to <application>tcpwrappers</application></title>
+
+<para>The <application>tcpwrappers</application> package provides daemon 
+wrapper programs that report the name of the client requesting network services and the requested service.</para> 
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&tcpwrappers-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&tcpwrappers-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &tcpwrappers-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&tcpwrappers-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&tcpwrappers-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required patch (Fixes some build issues and adds building of a shared library):
+<ulink url="&patch-root;/tcp_wrappers-7.6-shared-lib-plus-plus.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>tcpwrappers</application></title>
+
+<para>Install <application>tcpwrappers</application> with the following 
+commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../tcp_wrappers-7.6-shared-lib-plus-plus.patch &amp;&amp;
+make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>tcpwrappers</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/hosts.allow</filename>,
+<filename>/etc/hosts.deny</filename></para>
+
+<para>File protections: the wrapper, all files used by the wrapper,
+and all directories in the path leading to those files, should be
+accessible but not writable for unprivileged users (mode 755 or mode
+555). Do not install the wrapper set-uid.</para>
+
+<para>Then perform the following edits on the
+<filename>/etc/inetd.conf</filename> configuration file:</para>
+<screen><userinput>finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd</userinput></screen>
+<para>becomes:</para>
+<screen><userinput>finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd</userinput></screen>
+
+<note><para>The finger server is used as an example here.</para></note>
+
+<para>Similar changes must be made if xinetd is used, with the emphasis being 
+on calling <command>/usr/sbin/tcpd</command> instead of calling the service 
+daemon directly, and passing the name of the service daemon to tcpd.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>tcpwrappers</application> package contains <command>
+tcpd</command>, <command>tcpdchk</command>, <command>tcpdmatch</command>,
+<command>try-from</command> and <command>safe_finger</command>.</para>
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>tcpd</title>
+<para><command>tcpd</command> is the main access control daemon for all 
+Internet services, which <command>inetd</command> or
+<command>xinetd</command> will run instead of running the
+requested service daemon.</para></sect3>
+
+<sect3><title>tcpdchk</title>
+<para><command>tcpdchk</command> is a tool to examine a tcpd wrapper 
+configuration and report problems with it.</para></sect3>
+
+<sect3><title>tcpdmatch</title>
+<para><command>tcpdmatch</command> is used to predict how the tcp wrapper 
+would handle a specific request for a service.</para></sect3>
+
+<sect3><title>try-from</title>
+<para><command>try-from</command> can be called via a remote shell command to 
+find out if the host name and address are properly recognized.</para></sect3>
+
+<sect3><title>safe_finger</title>
+<para><command>safe_finger</command> is a wrapper for the <command>finger
+</command> utility, to provide automatic reverse name lookups.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netprogs/wget.xml
===================================================================
--- basicnet/netprogs/wget.xml	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ basicnet/netprogs/wget.xml	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -1,11 +1,99 @@
+<?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 wget-download-http "http://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.gz">
+  <!ENTITY wget-download-ftp  "ftp://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.gz">
+  <!ENTITY wget-size          "1.3 MB">
+  <!ENTITY wget-buildsize     "6.2 MB">
+  <!ENTITY wget-time          "0.11 SBU">
+]>
 <sect1 id="wget" xreflabel="Wget-&wget-version;">
 <?dbhtml filename="wget.html"?>
 <title>Wget-&wget-version;</title>
 
-&wget-intro;
-&wget-inst;
-&wget-exp;
-&wget-config;
-&wget-desc;
+<sect2>
+<title>Introduction to <application>Wget</application></title>
+
+<para>The <application>Wget</application> package contains a utility useful for 
+non-interactive downloading of files from the Web.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&wget-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&wget-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &wget-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&wget-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&wget-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>Wget</application> dependencies</title>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="openssl"/> and
+<ulink url="http://www.inet.no/dante/">Dante</ulink>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>Wget</application></title>
+
+<para>Install <application>Wget</application> by running the following commands:
+</para>
+
+<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>--prefix=/usr</parameter>: This compiles and installs
+<command>wget</command> into the <filename class="directory">/usr</filename> hierarchy instead 
+of <filename class="directory">/usr/local</filename>.</para>
+
+<para><parameter>--sysconfdir=/etc</parameter>: This relocates
+the configuration file from <filename class="directory">/usr/etc</filename> to
+<filename class="directory">/etc</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>Wget</application></title>
+
+<sect3><title>Config files</title>
+<para><filename>/etc/wgetrc</filename>, <filename>~/.wgetrc</filename></para>
+
+<para>There are no required changes in these files.</para>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>Wget</application> package contains <command>wget</command>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>wget</title>
+<para><command>wget</command> retrieves files from the Web using the
+<acronym>HTTP</acronym>, <acronym>HTTPS</acronym> and
+<acronym>FTP</acronym> protocols.  It is designed to be non-interactive, for 
+background or unattended operations.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 773c3586e85016be893a2b6cd480dc0540e92414)
+++ general.ent	(revision d47e7ea95eb5c2b2cdee553b3fe0dbd542459a4c)
@@ -74,5 +74,15 @@
 
 <!-- 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 -->
