Index: basicnet/basicnet.ent
===================================================================
--- basicnet/basicnet.ent	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ basicnet/basicnet.ent	(revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -70,9 +70,2 @@
 %nail;
 %slrn;
-
-<!-- DJB -->
-<!ENTITY basicnet-djb SYSTEM "djb/djb.xml">
-<!ENTITY % daemontools SYSTEM "djb/daemontools/daemontools.ent">
-<!ENTITY % ucspi-tcp SYSTEM "djb/ucspi-tcp/ucspi-tcp.ent">
-%daemontools;
-%ucspi-tcp;
Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ basicnet/basicnet.xml	(revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -8,5 +8,4 @@
 &basicnet-netutils;
 &basicnet-mailnews;
-&basicnet-djb;
 
 </part>
Index: sicnet/djb/daemontools.xml
===================================================================
--- basicnet/djb/daemontools.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="daemontools" xreflabel="daemontools">
-<?dbhtml filename="daemontools.html" dir="basicnet"?>
-<title>daemontools-&daemontools-version;</title>
-
-&daemontools-intro;
-&daemontools-inst;
-&daemontools-exp;
-&daemontools-desc;
-
-</sect1>
-
Index: sicnet/djb/daemontools/daemontools-desc.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-desc.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The daemontools package contains
-<command>svscanboot</command>, <command>svscan</command>,
-<command>supervise</command>, <command>svc</command>,
-<command>svok</command>, <command>svstat</command>,
-<command>fghack</command>, <command>pgrphack</command>,
-<command>readproctitle</command>, <command>multilog</command>,
-<command>tai64n</command>, <command>tai64nlocal</command>,
-<command>setuidgid</command>, <command>envuidgid</command>,
-<command>envdir</command>, <command>softlimit</command> and 
-<command>setlock</command>. More detailed descriptions of these 
-commands may be found at <ulink url="http://cr.yp.to/daemontools.html"/>.</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>svscanboot</title>
-<para><command>svscanboot</command> is simply a script that calls
-<command>svscan</command> and pipes its output to readproctitle.</para></sect3>
-
-<sect3><title>svscan</title>
-<para><command>svscan</command> checks the <filename>service</filename> 
-directory for daemons to run and starts a <command>supervise</command> process 
-for each run script that it finds.</para></sect3>
-
-<sect3><title>supervise</title>
-<para><command>supervise</command> runs the run script passed to it by
-<command>svscan</command> and monitors the process the script starts so that 
-if it dies, <command>supervise</command> restarts it.</para></sect3>
-
-<sect3><title>svc</title>
-<para><command>svc</command> sends signals to processes being run under 
-<command>supervise</command>.
-</para></sect3>
-
-<sect3><title>svok</title>
-<para><command>svok</command> checks to see that
-<command>supervise</command> is running in the directory 
-passed to it.</para></sect3>
-
-<sect3><title>svstat</title>
-<para><command>svstat</command> prints the status of processes monitored by 
-<command>supervise</command>.</para></sect3>
-
-<sect3><title>fghack</title>
-<para><command>fghack</command> prevents processes from putting themselves into 
-the background.</para></sect3>
-
-<sect3><title>pgrphack</title>
-<para><command>pgrphack</command> runs a process in a separate process group.
-</para></sect3>
-
-<sect3><title>readproctitle</title>
-<para><command>readproctitle</command> displays log entries in the output of 
-<command>ps</command>.
-</para></sect3>
-
-<sect3><title>multilog</title>
-<para><command>multilog</command> is a logging program. It takes output from a 
-daemon and appends it to any number of logs.</para></sect3>
-
-<sect3><title>tai64n</title>
-<para><command>tai64n</command> is a timestamp generating program.</para>
-</sect3>
-
-<sect3><title>tai64nlocal</title>
-<para><command>tai64nlocal</command> converts output of tai64n into a human 
-readable format.</para></sect3>
-
-<sect3><title>setuidgid</title>
-<para><command>setuidgid</command> runs a specified program under a given 
-account's <acronym>UID</acronym> and <acronym>GID</acronym>.</para></sect3>
-
-<sect3><title>envuidgid</title>
-<para><command>envuidgid</command> performs the same function as setuidgid, 
-but sets environment variables <envar>UID</envar> and <envar>GID</envar> equal 
-to the <acronym>UID</acronym> and <acronym>GID</acronym> of the account specified.</para></sect3>
-
-<sect3><title>envdir</title>
-<para><command>envdir</command> runs a given program with environment variables 
-specified by files in a directory.</para></sect3>
-
-<sect3><title>softlimit</title>
-<para><command>softlimit</command> allows resource limits to be set for a given 
-program.</para></sect3>
-
-<sect3><title>setlock</title>
-<para><command>setlock</command> locks a file and runs a program.</para></sect3>
-
-</sect2>
-
Index: sicnet/djb/daemontools/daemontools-exp.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-exp.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para>The first thing to understand in installing any package written 
-by Daniel J. Bernstein, and 
-this includes <application>qmail</application>, <application>djbdns
-</application> and <application>ucspi-tcp</application> in addition to 
-<application>daemontools</application>, is that he is willing to completely 
-disregard standards if his idea of the correct thing to do differs from an 
-particular standard. Professor Bernstein is a standards body unto himself when 
-it comes to his own software. </para>
-
-<para>It is therefore necessary to make quite a few changes to the 
-installation commands for his packages to get them to install in a manner 
-that is compliant with the Filesystem Hierarchy Standard
-(<acronym>FHS</acronym>). Most of the following commands are due to this 
-difficulty.</para>
-
-<para><command>cd admin/daemontools-0.76</command>: First off, the package is 
-unpacked in an <filename>admin</filename> directory. You will find the actual 
-packages two directory levels below this.</para>
-
-<para><command>package/compile</command>: This command actually 
-compiles the source and prepares the binaries.</para>
-
-<para>Since we are installing the binaries in <filename>/usr/sbin</filename> 
-rather than creating a non-standard <filename>/command</filename> directory, 
-several paths have to be changed:</para>
-<screen><command>sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~
-mv boot.inittab~ boot.inittab</command></screen>
-<para>In <filename>boot.inittab</filename>,
-<filename>/command/svscanboot</filename> is changed to
-<filename>/usr/sbin/svscanboot</filename>.</para>
-
-<screen><command>sed -e 's|/command:/usr/local/bin:/usr/local/sbin:||' \
-    -e 's|command|usr/sbin|' \
-    -e 's|/service|/etc/service|g' svscanboot &gt; svscanboot~ &amp;&amp;</command></screen>
-<para>Here various paths are adjusted in the <command>svscanboot</command> 
-script. In our setup <command>svscan</command> will check the 
-<filename>/etc/service</filename> directory instead of
-the <filename>/service</filename> directory for daemons to run.</para>
-
-<para><command>cp * /usr/sbin</command>: We must manually copy the 
-binaries to the <filename>/usr/sbin</filename> directory.</para>
-
-<para><screen><command>cat /etc/inittab boot.inittab &gt; /etc/inittab~
-mv -f /etc/inittab~ /etc/inittab</command></screen>
-These commands append a line to <filename>/etc/inittab</filename> so that 
-<command>init</command> will launch the <command>svscanboot</command> script.
-</para>
-
-<para><command>mkdir /etc/service</command>: This command creates 
-the <application>daemontools</application> control directory, which - even if 
-empty - needs to exist for 
-<application>daemontools</application> to run properly.</para>
-
-<para><command>telinit Q</command>: This command tells the <command>init
-</command> process to re-read its configuration file 
-(<filename>inittab</filename>) and act upon any changes that have been made. 
-The <command>svscanboot</command> script is started.</para>
-
-
-</sect2>
-
Index: sicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<sect2>
-<title>Installation of <application>daemontools</application></title>
-
-<para>Install <application>daemontools</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>cd admin/daemontools-0.76 &amp;&amp; 
-patch -Np1 -i ../../daemontools-0.76-errno.patch &amp;&amp;
-package/compile &amp;&amp;
-cd package &amp;&amp; 
-sed 's|command|usr/sbin|' boot.inittab &gt; boot.inittab~ &amp;&amp; 
-mv boot.inittab~ boot.inittab &amp;&amp;
-cd ../command &amp;&amp;
-sed -e 's|/command:/usr/local/bin:/usr/local/sbin:||' \
-    -e 's|command|usr/sbin|' \
-    -e 's|/service|/etc/service|g' svscanboot &gt; svscanboot~ &amp;&amp;
-mv svscanboot~ svscanboot &amp;&amp;
-chmod 555 svscanboot &amp;&amp;
-cp * /usr/sbin &amp;&amp;
-cd ../package &amp;&amp; 
-cat /etc/inittab boot.inittab &gt; /etc/inittab~ &amp;&amp; 
-mv -f /etc/inittab~ /etc/inittab &amp;&amp; 
-mkdir /etc/service &amp;&amp;
-telinit Q</command></userinput></screen>
-
-<para>The daemontools package does not come with man pages, so install
-this package if you want online help with the daemontools programs:</para>
-
-<screen><userinput><command>tar xzvf daemontools-0.76-man.tar.gz &amp;&amp;
-cp daemontools-man/*.8 /usr/share/man/man8</command></userinput></screen>
-
-</sect2>
Index: sicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<sect2>
-<title>Introduction to <application>daemontools</application></title>
-
-<para>The <application>daemontools</application> package is a replacement for 
-<application>inetd</application> or <application>xinetd</application>. The main 
-reason for using it here is because it is recommended for use with 
-<application>qmail</application> and <application>djbdns</application>.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&daemontools-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&daemontools-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &daemontools-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&daemontools-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&daemontools-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required patch:
-<ulink url="&patch-root;/daemontools-0.76-errno.patch"/></para></listitem>
-<listitem><para>Man pages: <ulink
-url="http://smarden.org/pape/djb/manpages/daemontools-0.76-man.tar.gz"/></para></listitem>
-</itemizedlist>
-</sect3>
-
-</sect2>
Index: sicnet/djb/daemontools/daemontools.ent
===================================================================
--- basicnet/djb/daemontools/daemontools.ent	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY daemontools SYSTEM "../daemontools.xml">
-<!ENTITY daemontools-intro SYSTEM "daemontools-intro.xml">
-<!ENTITY daemontools-inst SYSTEM "daemontools-inst.xml">
-<!ENTITY daemontools-exp SYSTEM "daemontools-exp.xml">
-<!ENTITY daemontools-desc SYSTEM "daemontools-desc.xml">
-<!ENTITY daemontools-version "0.76">
-<!ENTITY daemontools-download-http "http://cr.yp.to/daemontools/daemontools-&daemontools-version;.tar.gz">
-<!ENTITY daemontools-download-ftp "ftp://ftp.lug.udel.edu/pub/network/mail/qmail/daemontools-&daemontools-version;.tar.gz">
-<!ENTITY daemontools-size "36 KB">
-<!ENTITY daemontools-buildsize "1.8 MB">
-<!ENTITY daemontools-time "0.05 SBU">
Index: sicnet/djb/djb.xml
===================================================================
--- basicnet/djb/djb.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,13 +1,0 @@
-<chapter id="basicnet-djb">
-<?dbhtml filename="djb.html" dir="basicnet"?>
-<title>D.J. Bernstein's Utilities</title>
-
-<para>This chapter includes applications needed for the qmail server.
-Their installation instructions are different than most packages in the
-book because we want to support the <acronym>FHS</acronym> throughout
-the book.</para>
-
-&daemontools;
-&ucspi-tcp;
-
-</chapter>
Index: sicnet/djb/ucspi-tcp.xml
===================================================================
--- basicnet/djb/ucspi-tcp.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="ucspi-tcp" xreflabel="ucspi-tcp">
-<?dbhtml filename="ucspi-tcp.html" dir="basicnet"?>
-<title>ucspi-tcp-&ucspi-tcp-version;</title>
-
-&ucspi-tcp-intro;
-&ucspi-tcp-inst;
-&ucspi-tcp-exp;
-&ucspi-tcp-desc;
-
-</sect1>
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-desc.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The ucspi-tcp package contains <command>tcpserver</command>,
-<command>tcprules</command>, <command>tcprulescheck</command>,
-<command>argv0</command>, <command>fixcrio</command>,
-<command>recordio</command>, <command>rblsmtpd</command>,
-<command>tcpclient</command>, <command>who@</command>,
-<command>date@</command>, <command>finger@</command>,
-<command>http@</command>, <command>tcpcat</command>,
-<command>mconnect</command>, <command>addcr</command> and
-<command>delcr</command></para>
-
-<para>You can also find detailed descriptions of each of these programs at 
-<ulink url="http://cr.yp.to/ucspi-tcp/tcpserver.html"/>, but here is a brief summary:</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>tcpserver</title>
-<para><command>tcpserver</command> listens for incoming <acronym>TCP</acronym> 
-connections on a given port, and runs a program of your choosing in response to 
-a connection.</para></sect3>
-
-<sect3><title>tcprules</title>
-<para><command>tcprules</command> compiles rules that govern access
-control for <command>tcpserver</command> into a fast access database format.
-</para></sect3>
-
-<sect3><title>tcprulescheck</title>
-<para><command>tcprulescheck</command> makes it possible to see how
-<command>tcpserver</command> will react to connections from a given address 
-without actually having to connect via that address. This is useful for 
-checking to see if the access control rules you are using are doing what you 
-expected.</para></sect3>
-
-<sect3><title>argv0</title>
-<para><command>argv0</command> runs a given program with a specified 0th 
-argument.</para></sect3>
-
-<sect3><title>fixcrio</title>
-<para><command>fixcrio</command> inserts carriage returns at the end of lines 
-when they are missing.</para></sect3>
-
-<sect3><title>recordio</title>
-<para><command>recordio</command> records all input and output of a program 
-given as an argument.</para></sect3>
-
-<sect3><title>rblsmtpd</title>
-<para><command>rblsmtpd</command> is a spam blocking program that works in 
-conjunction with your <acronym>SMTP</acronym> daemon and <command>tcpserver
-</command>.</para></sect3>
-
-<sect3><title>tcpclient</title>
-<para><command>tcpclient</command> creates a connection to a <acronym>TCP
-</acronym> port for a given program.</para></sect3>
-
-<sect3><title>who@</title>
-<para><command>who@</command> is a demonstration program using <command>
-tcpclient</command> that has the functionality of the <command>rwho</command> 
-program. It requires a server running <command>sysstat</command> on port 11.
-</para></sect3>
-
-<sect3><title>date@</title>
-<para><command>date@</command> is a demonstration program using <command>
-tcpclient</command> that will return the system time of a remote host which 
-is running a <command>daytime</command> service on port 13.</para></sect3>
-
-<sect3><title>finger@</title>
-<para><command>finger@</command> is a demonstration program using <command>
-tcpclient</command> that mimics the functionality of the <command>finger
-</command> program. It requires a server running <command>fingerd</command> 
-on port 79.</para></sect3>
-
-<sect3><title>http@</title>
-<para><command>http@</command> downloads web pages from web servers.</para>
-</sect3>
-
-<sect3><title>tcpcat</title>
-<para><command>tcpcat</command> connects to a <acronym>TCP</acronym> port and 
-prints all that is returned from the port.</para></sect3>
-
-<sect3><title>mconnect</title>
-<para><command>mconnect</command> connects to a <acronym>TCP</acronym> port, 
-delivers any input specified to the port, and prints any output from the port.
-</para></sect3>
-
-<sect3><title>addcr</title>
-<para><command>addcr</command> adds carriage returns to files. This and
-<command>delcr</command> are useful for converting between Windows to Unix file 
-formats.</para></sect3>
-
-<sect3><title>delcr</title>
-<para><command>delcr</command> removes carriage returns from files.</para>
-</sect3>
-
-</sect2>
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-exp.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><screen><command>sed 's|/usr/local|/usr|' conf-home &gt; conf-home~
-mv conf-home~ conf-home
-sed 's/bin/sbin/' hier.c &gt; hier.c~
-mv hier.c~ hier.c</command></screen> 
-These commands change the installation directory to
-<filename class="directory">/usr/sbin</filename> from the default 
-of <filename class="directory">/usr/local/bin</filename>. Since these tools 
-are used in conjunction with daemons, they don't make much sense in general 
-user directories. However, some of the example programs and the 
-<command>tcpclient</command> program might be of use to non-root users. 
-If you wish to make these available, then we would suggest installing as above, 
-and then executing the following commands: 
-<screen><command>cd /usr/sbin mv tcpclient *@ mconnect delcr addcr tcpcat /usr/bin</command></screen>
-This will place the client related programs into <filename>/usr/bin</filename> 
-for general use.</para>
-
-</sect2>
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-inst.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<sect2>
-<title>Installation of <application>ucspi-tcp</application></title>
-
-<para>Install <application>ucspi-tcp</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>patch -Np1 -i ../ucspi-tcp-0.88-errno.patch &amp;&amp;
-sed 's|/usr/local|/usr|' conf-home &gt; conf-home~ &amp;&amp;
-mv conf-home~ conf-home &amp;&amp;
-sed 's/bin/sbin/' hier.c &gt; hier.c~ &amp;&amp;
-mv hier.c~ hier.c &amp;&amp;
-make &amp;&amp;
-make setup check</command></userinput></screen>
-
-</sect2>
-
Index: sicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp-intro.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<sect2>
-<title>Introduction to <application>ucspi-tcp</application></title>
-
-<para>The <application>ucspi-tcp</application> package consists of a suite of 
-tools that allow the easy creation of client-server tcp daemons. <command>
-tcpserver</command> is a more secure alternative to <command>inetd</command>. 
-It has built in functionality for rule based access control, and 
-will gracefully defer connections when the configurable maximum load is reached,
-unlike <command>inetd</command>. <command>tcpserver</command> is also 
-recommended for use with <application>qmail</application>, and was written by 
-the same author.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&ucspi-tcp-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&ucspi-tcp-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &ucspi-tcp-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&ucspi-tcp-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&ucspi-tcp-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink url="&patch-root;/ucspi-tcp-0.88-errno.patch"/></para></listitem>
-</itemizedlist>
-</sect3>
-
-</sect2>
Index: sicnet/djb/ucspi-tcp/ucspi-tcp.ent
===================================================================
--- basicnet/djb/ucspi-tcp/ucspi-tcp.ent	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY ucspi-tcp SYSTEM "../ucspi-tcp.xml">
-<!ENTITY ucspi-tcp-intro SYSTEM "ucspi-tcp-intro.xml">
-<!ENTITY ucspi-tcp-inst SYSTEM "ucspi-tcp-inst.xml">
-<!ENTITY ucspi-tcp-exp SYSTEM "ucspi-tcp-exp.xml">
-<!ENTITY ucspi-tcp-desc SYSTEM "ucspi-tcp-desc.xml">
-<!ENTITY ucspi-tcp-version "0.88">
-<!ENTITY ucspi-tcp-download-http "http://cr.yp.to/ucspi-tcp/ucspi-tcp-&ucspi-tcp-version;.tar.gz">
-<!ENTITY ucspi-tcp-download-ftp "">
-<!ENTITY ucspi-tcp-size "52 KB">
-<!ENTITY ucspi-tcp-buildsize "2 MB">
-<!ENTITY ucspi-tcp-time "0.05 SBU">
Index: server/mail/mail.xml
===================================================================
--- server/mail/mail.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ server/mail/mail.xml	(revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -12,5 +12,4 @@
 
 &postfix;
-&qmail;
 &sendmail;
 &exim;
Index: rver/mail/qmail.xml
===================================================================
--- server/mail/qmail.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="qmail" xreflabel="qmail-&qmail-version;">
-<?dbhtml filename="qmail.html" dir="server"?>
-<title>qmail-&qmail-version;</title>
-
-&qmail-intro;
-&qmail-inst;
-&qmail-config;
-&qmail-desc;
-
-</sect1>
-
Index: rver/mail/qmail/qmail-config.xml
===================================================================
--- server/mail/qmail/qmail-config.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<sect2>
-<title>Configuring <application>qmail</application></title>
-
-<sect3><title>Config files</title>
-<para><filename>/etc/inetd.conf</filename> and boot scripts</para>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>If <command>inetd</command> is used, the following command will add the qmaild
-entry to <filename>/etc/inetd.conf</filename>: </para>
-
-<para><screen><userinput>echo "smtp stream tcp nowait qmaild /var/qmail/bin/tcp-env \
-tcp-env /var/qmail/bin/qmail-smtpd" &gt;&gt; /etc/inetd.conf</userinput></screen></para>
-
-<para>If <command>xinetd</command> is used, the following command will add the qmaild
-entry to <filename>/etc/xinetd.conf</filename>: </para>
-
-<screen><userinput><command>cat &gt;&gt; /etc/xinetd.conf &lt;&lt; "EOF"</command>
-service smtp
-{
-    disable = no
-    id                      = smtp-local
-    socket_type             = stream
-    protocol                = tcp
-    wait                    = no
-    user                    = qmaild
-    server                  = /var/qmail/bin/tcp-env
-    server_args             = /var/qmail/bin/qmail-smtpd
-    env                     = RELAYCLIENT=
-    only_from               = 127.0.0.1
-    log_on_failure         += USERID
-}
-<command>EOF</command></userinput></screen>
-
-<para>To automate the running of <application>qmail</application>, use following command to
-create the init.d script:</para> 
-
-<screen><userinput><command>cat &gt; /etc/rc.d/init.d/qmail &lt;&lt; "EOF"</command>
-#!/bin/sh
-# Begin $rc_base/init.d/qmail
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-source /etc/sysconfig/rc
-source $rc_functions
-
-case "$1" in
-
-        start)
-        echo "Starting Qmail..."
-	/var/qmail/rc &amp;
-        ;;
-
-        stop)
-        echo "Stopping Qmail..."
-        killall qmail-send
-        ;;
-		
-        restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-
-        *)
-        echo "Usage: $0 {start|stop|restart}"
-        exit 1
-        ;;
-esac
-
-# End $rc_base/init.d/qmail
-<command>EOF
-chmod 755 /etc/rc.d/init.d/qmail</command></userinput></screen>
-
-<para>Create the symbolic links to this file in the relevant
-<filename>rc.d</filename> directory with the following commands:</para>
-
-<screen><userinput><command>cd /etc/rc.d/init.d &amp;&amp;
-ln -sf ../init.d/qmail ../rc0.d/K25qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc1.d/K25qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc2.d/K25qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc3.d/S35qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc4.d/S35qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc5.d/S35qmail &amp;&amp;
-ln -sf ../init.d/qmail ../rc6.d/K25qmail</command></userinput></screen>
-
-</sect3>
-
-<sect3><title>Configuring mailers to work with qmail</title>
-<para>Configuration information for some commonly used MUAs can be
-found in the <filename>/var/qmail/doc/INSTALL.mbox</filename>
-file.  Most MUAs can be configured to use qmail Mailbox format buy
-putting the following in <filename>~/.profile</filename>:</para>
-<para><screen><userinput>MAIL=$HOME/Mailbox; export MAIL
-</userinput></screen></para></sect3>
-
-</sect2>
Index: rver/mail/qmail/qmail-desc.xml
===================================================================
--- server/mail/qmail/qmail-desc.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<sect2><title>Contents</title>
-<para>The qmail package contains
-<userinput>bouncesaying</userinput>,
-<userinput>condredirect</userinput>,
-<userinput>except</userinput>,
-<userinput>forward</userinput>,
-<userinput>maildir2mbox</userinput>,
-<userinput>maildirmake</userinput>,
-<userinput>maildirwatch</userinput>,
-<userinput>mailsubj</userinput>,
-<userinput>preline</userinput>,
-<userinput>qbiff</userinput>,
-<userinput>qreceipt</userinput>,
-<userinput>qmail-clean</userinput>,
-<userinput>qmail-inject</userinput>,
-<userinput>qmail-local</userinput>,
-<userinput>qmail-pop3d</userinput>,
-<userinput>qmail-popup</userinput>,
-<userinput>qmail-qstat</userinput>,
-<userinput>qmail-send</userinput>,
-<userinput>qmail-smtpd</userinput> and
-<userinput>qmail-start</userinput>.</para>
-</sect2>
-<sect2><title>Description</title>
-<sect3><title>bouncesaying</title>
-<para>bouncesaying processes, possibly bouncing, incoming
-messages.</para></sect3>
-<sect3><title>condredirect</title>
-<para>condredirect processes, possibly redirecting incoming
-messages.</para></sect3>
-<sect3><title>except</title>
-<para>except reverses the exit code of a program.</para></sect3>
-<sect3><title>forward</title>
-<para>forward forwards new mail to one or more
-addresses.</para></sect3>
-<sect3><title>maildir2mbox</title>
-<para>maildir2mbox moves current email from an maildir-format
-directory to an mbox-format file.</para></sect3>
-<sect3><title>maildirmake</title>
-<para>maildirmake create a maildir format directory for incoming
-mail.</para></sect3>
-<sect3><title>maildirwatch</title>
-<para>maildirwatch watches a users maildir and prints a new mail
-summary every 30 seconds.</para></sect3>
-<sect3><title>mailsubj</title>
-<para>mailsubj sends a mail message with a subject supplied on the
-command-line.  The body of the message is read from standard
-input.</para></sect3>
-<sect3><title>preline</title>
-<para>preline prepends lines to a message.</para></sect3>
-<sect3><title>qbiff</title>
-<para>qbiff announces new mail as soon as it arrives.</para></sect3>
-<sect3><title>qreceipt</title>
-<para>qreceipt responds to delivery notice requests.</para></sect3>
-<sect3><title>qmail-clean</title>
-<para>qmail-clean cleans up the queue directory.</para></sect3>
-<sect3><title>qmail-inject</title>
-<para>qmail-inject preprocesses and sends a mail
-message.</para></sect3>
-<sect3><title>qmail-local</title>
-<para>qmail-local delivers or forwards mail messages.</para></sect3>
-<sect3><title>qmail-pop3d</title>
-<para>qmail-pop3d accesses users' pop3 mail accounts.</para></sect3>
-<sect3><title>qmail-popup</title>
-<para>qmail-popup reads pop3 usernames and passwords.</para></sect3>
-<sect3><title>qmail-qstat</title>
-<para>qmail-qstat summarizes mail queue statistics.</para></sect3>
-<sect3><title>qmail-send</title>
-<para>qmail-send delivers mail from the message queue.</para></sect3>
-<sect3><title>qmail-smtpd</title>
-<para>qmail-smtpd receives mail via SMTP.</para></sect3>
-<sect3><title>qmail-start</title>
-<para>qmail-start enables mail delivery services, spawning qmail-send,
-qmail-lspawn,  qmail-rspawn, and qmail-clean.</para></sect3>
-</sect2>
-
Index: rver/mail/qmail/qmail-inst.xml
===================================================================
--- server/mail/qmail/qmail-inst.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<sect2>
-<title>Installation of <application>qmail</application></title>
-
-<para><application>qmail</application> needs certain user and group account to be added before
-installation of the software.  Add the users and groups with the
-following commands:</para>
-
-
-<screen><userinput><command>mkdir /var/qmail &amp;&amp;
-groupadd nofiles &amp;&amp;
-useradd -g nofiles -d /var/qmail/alias alias &amp;&amp;
-useradd -g nofiles -d /var/qmail qmaild &amp;&amp;
-useradd -g nofiles -d /var/qmail qmaill &amp;&amp;
-useradd -g nofiles -d /var/qmail qmailp &amp;&amp;
-groupadd qmail &amp;&amp;
-useradd -g qmail -d /var/qmail qmailq &amp;&amp;
-useradd -g qmail -d /var/qmail qmailr &amp;&amp;
-useradd -g qmail -d /var/qmail qmails</command></userinput></screen>
-
-<para>Install <application>qmail</application> by running the following commands:</para>
-
-<screen><userinput><command>patch -Np1 -i ../qmail-1.03-errno.patch &amp;&amp;
-make setup check &amp;&amp;
-./config-fast `hostname` &amp;&amp;
-cd /var/qmail &amp;&amp;
-touch .qmail-postmaster .qmail-mailer-daemon .qmail-root &amp;&amp;
-chmod 644 .qmail-* &amp;&amp;
-ln -s /var/qmail/bin/sendmail /usr/sbin/sendmail &amp;&amp;
-mv /var/qmail/boot/home /var/qmail/rc &amp;&amp;
-for mandir in 1 5 7 8; do mv /var/qmail/man/man$mandir/* \
-    /usr/man/man$mandir; done &amp;&amp;
-rm -rf /var/qmail/man</command></userinput></screen>
-</sect2>
Index: rver/mail/qmail/qmail-intro.xml
===================================================================
--- server/mail/qmail/qmail-intro.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<sect2>
-<title>Introduction to <application>qmail</application></title>
-
-<para>The <application>qmail</application> package contains Dan Bernstein's Mail Transport Agent
-(MTA). <application>qmail</application> provides local and remote mail delivery/relaying.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&qmail-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&qmail-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &qmail-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&qmail-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&qmail-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required patch:
-<ulink url="&patch-root;/qmail-1.03-errno.patch"/>
-</para></listitem></itemizedlist>
-</sect3>
-
-
-</sect2>
Index: rver/mail/qmail/qmail.ent
===================================================================
--- server/mail/qmail/qmail.ent	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY qmail SYSTEM "../qmail.xml">
-<!ENTITY qmail-intro SYSTEM "qmail-intro.xml">
-<!ENTITY qmail-inst SYSTEM "qmail-inst.xml">
-<!ENTITY qmail-config SYSTEM "qmail-config.xml">
-<!ENTITY qmail-desc SYSTEM "qmail-desc.xml">
-<!ENTITY qmail-version "1.03">
-<!ENTITY qmail-download-http "http://www.qmail.org/qmail-&qmail-version;.tar.gz">
-<!ENTITY qmail-download-ftp "ftp://ftp.comimpex.cz/LINUX/System/qmail-&qmail-version;.tar.gz">
-<!ENTITY qmail-size "225 KB">
-<!ENTITY qmail-buildsize "4.6 MB">
-<!ENTITY qmail-time "0.14 SBU">
Index: server/mail/qpopper/qpopper-intro.xml
===================================================================
--- server/mail/qpopper/qpopper-intro.xml	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ server/mail/qpopper/qpopper-intro.xml	(revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -17,6 +17,5 @@
 <sect3><title><application>Qpopper</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="sendmail"/> or <xref linkend="postfix"/> or <xref
-linkend="qmail"/>
+<para><xref linkend="sendmail"/> or <xref linkend="postfix"/>
 </para></sect4>
 </sect3>
Index: server/server.ent
===================================================================
--- server/server.ent	(revision 8d94e41537402baa4a47f18f038e5fdae0bdb907)
+++ server/server.ent	(revision ba96abc4cddcd92640908e6720a48d37bdcbce44)
@@ -4,5 +4,4 @@
 <!ENTITY server-mail SYSTEM "mail/mail.xml">
 <!ENTITY % postfix   SYSTEM "mail/postfix/postfix.ent">
-<!ENTITY % qmail     SYSTEM "mail/qmail/qmail.ent">
 <!ENTITY % sendmail  SYSTEM "mail/sendmail/sendmail.ent">
 <!ENTITY % exim      SYSTEM "mail/exim/exim.ent">
@@ -11,5 +10,4 @@
 %exim;
 %postfix;
-%qmail;
 %qpopper;
 %sendmail;
