Index: basicnet/basicnet.ent
===================================================================
--- basicnet/basicnet.ent	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ basicnet/basicnet.ent	(revision d8960861f9dda1bc2b8e271bb0a13cce89b559fe)
@@ -74,7 +74,5 @@
 <!ENTITY basicnet-djb SYSTEM "djb/djb.xml">
 <!ENTITY % daemontools SYSTEM "djb/daemontools/daemontools.ent">
-<!ENTITY % daemontools-man SYSTEM "djb/daemontools-man/daemontools-man.ent">
 <!ENTITY % ucspi-tcp SYSTEM "djb/ucspi-tcp/ucspi-tcp.ent">
 %daemontools;
-%daemontools-man;
 %ucspi-tcp;
Index: sicnet/djb/daemontools-man.xml
===================================================================
--- basicnet/djb/daemontools-man.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<sect1 id="daemontools-man" xreflabel="daemontools-man">
-<?dbhtml filename="daemontools-man.html" dir="basicnet"?>
-<title>daemontools-man-&daemontools-man-version;</title>
-
-&daemontools-man-intro;
-&daemontools-man-inst;
-&daemontools-man-exp;
-&daemontools-man-desc;
-
-</sect1>
-
Index: sicnet/djb/daemontools-man/daemontools-man-desc.xml
===================================================================
--- basicnet/djb/daemontools-man/daemontools-man-desc.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application>daemontools-man</application> package contains man pages 
-for the <application>daemontools</application> commands 
-<command>envdir</command>,
-<command>envuidgid</command>, <command>fghack</command>,
-<command>multilog</command>, <command>pgrphack</command>,
-<command>readproctitle</command>, <command>setlock</command>,
-<command>setuidgid</command>, <command>softlimit</command>,
-<command>supervise</command>, <command>svc</command>,
-<command>svok</command>, <command>svscan</command>,
-<command>svscanboot</command>, <command>svstat</command>,
-<command>tai64n</command> and
-<command>tai64nlocal</command>.</para>
-
-</sect2>
Index: sicnet/djb/daemontools-man/daemontools-man-exp.xml
===================================================================
--- basicnet/djb/daemontools-man/daemontools-man-exp.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ 	(revision )
@@ -1,8 +1,0 @@
-<sect2>
-<title>Command explanations</title>
-
-<para><command>gzip -9 *.8</command>: You can compress the man pages
-to save space, but it isn't needed for the man pages to work.</para>
-
-</sect2>
-
Index: sicnet/djb/daemontools-man/daemontools-man-inst.xml
===================================================================
--- basicnet/djb/daemontools-man/daemontools-man-inst.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ 	(revision )
@@ -1,9 +1,0 @@
-<sect2>
-<title>Installation of <application>daemontools-man</application></title>
-
-<para>Install <application>daemontools-man</application> by running the 
-following commands:</para>
-
-<screen><userinput><command>cd daemontools-man &amp;&amp; 
-cp *.8 /usr/share/man/man8</command></userinput></screen>
-</sect2>
Index: sicnet/djb/daemontools-man/daemontools-man-intro.xml
===================================================================
--- basicnet/djb/daemontools-man/daemontools-man-intro.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<sect2>
-<title>Introduction to <application>daemontools-man</application></title>
-
-
-<para>The <application>daemontools</application> package does not come with 
-man pages, so install this package if you want online help with the 
-<application>daemontools</application> programs.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&daemontools-man-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&daemontools-man-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &daemontools-man-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&daemontools-man-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&daemontools-man-time;</para></listitem></itemizedlist>
-</sect3>
-
-
-</sect2>
Index: sicnet/djb/daemontools-man/daemontools-man.ent
===================================================================
--- basicnet/djb/daemontools-man/daemontools-man.ent	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<!ENTITY daemontools-man SYSTEM "../daemontools-man.xml">
-<!ENTITY daemontools-man-intro SYSTEM "daemontools-man-intro.xml">
-<!ENTITY daemontools-man-inst SYSTEM "daemontools-man-inst.xml">
-<!ENTITY daemontools-man-exp SYSTEM "daemontools-man-exp.xml">
-<!ENTITY daemontools-man-desc SYSTEM "daemontools-man-desc.xml">
-<!ENTITY daemontools-man-version "0.76">
-<!ENTITY daemontools-man-download-http "http://smarden.org/pape/djb/manpages/daemontools-&daemontools-man-version;-man.tar.gz">
-<!ENTITY daemontools-man-download-ftp "">
-<!ENTITY daemontools-man-size "8 KB">
-<!ENTITY daemontools-man-buildsize "80 KB">
-<!ENTITY daemontools-man-time "0.00 SBU">
Index: basicnet/djb/daemontools/daemontools-inst.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-inst.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ basicnet/djb/daemontools/daemontools-inst.xml	(revision d8960861f9dda1bc2b8e271bb0a13cce89b559fe)
@@ -24,4 +24,9 @@
 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: basicnet/djb/daemontools/daemontools-intro.xml
===================================================================
--- basicnet/djb/daemontools/daemontools-intro.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ basicnet/djb/daemontools/daemontools-intro.xml	(revision d8960861f9dda1bc2b8e271bb0a13cce89b559fe)
@@ -24,7 +24,8 @@
 <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: basicnet/djb/djb.xml
===================================================================
--- basicnet/djb/djb.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ basicnet/djb/djb.xml	(revision d8960861f9dda1bc2b8e271bb0a13cce89b559fe)
@@ -9,5 +9,4 @@
 
 &daemontools;
-&daemontools-man;
 &ucspi-tcp;
 
Index: index.xml
===================================================================
--- index.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ index.xml	(revision d8960861f9dda1bc2b8e271bb0a13cce89b559fe)
@@ -3,6 +3,6 @@
 			"/usr/share/docbook/docbookx.dtd" [
 
-<!ENTITY version "CVS-20031029">
-<!ENTITY releasedate "October 29th, 2003">
+<!ENTITY version "CVS-20031030">
+<!ENTITY releasedate "October 30th, 2003">
 <!ENTITY blfs-version "cvs">
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a3bccff0124bce91cc1f6d0104fd77c62bd1b6ef)
+++ introduction/welcome/changelog.xml	(revision d8960861f9dda1bc2b8e271bb0a13cce89b559fe)
@@ -12,4 +12,7 @@
 <itemizedlist>
 
+<listitem><para>October 30th, 2003 [igor]: Integrated daemontools-man
+package with the main daemontools page.</para></listitem>
+    
 <listitem><para>October 29th, 2003 [bdubbs]: Updated XFree86 instructions
 for consistency and minor appearance tweaks.</para></listitem>
