Index: basicnet/mailnews/mutt/mutt-inst.xml
===================================================================
--- basicnet/mailnews/mutt/mutt-inst.xml	(revision 8c726dbe1f91d3369abbd3d3957e2f753b501d77)
+++ basicnet/mailnews/mutt/mutt-inst.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -4,5 +4,5 @@
 <para>Install mutt by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp; &amp;
+<para><screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
 make &amp;&amp;
 make install </userinput></screen></para>
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision 8c726dbe1f91d3369abbd3d3957e2f753b501d77)
+++ basicnet/netutils/whois.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -1,7 +1,9 @@
 <sect1 id="whois" xreflabel="whois">
 <?dbhtml filename="whois.html" dir="basicnet"?>
-<title>whois</title>
+<title>whois-&whois-version;</title>
 
-<para>TO BE DONE</para>
+&whois-intro;
+&whois-inst;
+&whois-desc;
 
 </sect1>
Index: basicnet/netutils/whois/whois-desc.xml
===================================================================
--- basicnet/netutils/whois/whois-desc.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
+++ basicnet/netutils/whois/whois-desc.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The whois package contains <userinput>whois</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>whois</title>
+<para>whois is a client-side application which queries the whois directory
+service for information pertaining to a particular domain
+name.</para></sect3>
+
+</sect2>
Index: basicnet/netutils/whois/whois-inst.xml
===================================================================
--- basicnet/netutils/whois/whois-inst.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
+++ basicnet/netutils/whois/whois-inst.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -0,0 +1,10 @@
+<sect2>
+<title>Installation of whois</title>
+
+<para>Install whois by running the following commands:</para>
+
+<para><screen><userinput>make &amp;&amp;
+make prefix=/usr install</userinput></screen></para>
+
+</sect2>
+
Index: basicnet/netutils/whois/whois-intro.xml
===================================================================
--- basicnet/netutils/whois/whois-intro.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
+++ basicnet/netutils/whois/whois-intro.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Introduction to whois</title>
+
+<screen>Download location (HTTP):       <ulink url="&whois-download-http;"/>
+Download location (FTP):        <ulink url="&whois-download-ftp;"/>
+Version used:                   &whois-version;
+Package size:                   &whois-size;
+Estimated Disk space required:  &whois-buildsize;</screen>
+
+<para>whois is a client-side application which queries the whois directory
+service for information pertaining to a particular domain
+name.</para></sect2>
Index: basicnet/netutils/whois/whois.ent
===================================================================
--- basicnet/netutils/whois/whois.ent	(revision 8c726dbe1f91d3369abbd3d3957e2f753b501d77)
+++ basicnet/netutils/whois/whois.ent	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -1,1 +1,9 @@
 <!ENTITY whois SYSTEM "../whois.xml">
+<!ENTITY whois-intro SYSTEM "whois-intro.xml">
+<!ENTITY whois-inst SYSTEM "whois-inst.xml">
+<!ENTITY whois-desc SYSTEM "whois-desc.xml">
+<!ENTITY whois-buildsize "60 KB">
+<!ENTITY whois-version "4.5.28">
+<!ENTITY whois-download-http "http://www.linux.it/~md/software/whois_4.5.28.tar.gz">
+<!ENTITY whois-download-ftp "ftp://ftp.debian.org/debian/pool/main/w/whois/whois_4.5.28.tar.gz">
+<!ENTITY whois-size "33 KB">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 8c726dbe1f91d3369abbd3d3957e2f753b501d77)
+++ introduction/welcome/changelog.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -11,5 +11,8 @@
 <itemizedlist>
 
-<listitem><para>August 6th 2002 [larry]: Basic networking: added
+<listitem><para>August 6th, 2002 [larry]: Basic networking: added
+whois-4.5.28 submitted by Timothy.</para></listitem>
+
+<listitem><para>August 6th, 2002 [larry]: Basic networking: added
 telnet-0.17.  Client ONLY. Subject to replacement by inettools or
 netkit-combo when completed by assignee.</para></listitem>
Index: introduction/welcome/credits.xml
===================================================================
--- introduction/welcome/credits.xml	(revision 8c726dbe1f91d3369abbd3d3957e2f753b501d77)
+++ introduction/welcome/credits.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -101,5 +101,5 @@
 Rohde</emphasis></para></listitem>
 
-<listitem><para>nano: <emphasis>Timothy
+<listitem><para>nano and whois: <emphasis>Timothy
 Bauscher</emphasis></para></listitem>
 
Index: multimedia/cdwriteutils/cdrdao/cdrdao-inst.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao-inst.xml	(revision 8c726dbe1f91d3369abbd3d3957e2f753b501d77)
+++ multimedia/cdwriteutils/cdrdao/cdrdao-inst.xml	(revision 3fbf582545979b49c887f828083cd30f3f3babce)
@@ -4,5 +4,6 @@
 <para>Install cdrdao by running the following commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+<para><screen><userinput>patch -Np1 -i ../cdrdao-1.1.5-gcc-3.1-patch.diff &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
 make &amp;&amp;
 make install </userinput></screen></para>
