Index: README
===================================================================
--- README	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ README	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -12,8 +12,8 @@
               content x kde gnome xsoft multimedia pst preface \
               appendices other
-	/usr/bin/openjade -t xml \
-		-d /usr/share/dsssl/docbook/html/blfs.dsl \
-		/usr/share/dsssl/docbook/dtds/decls/xml.dcl \
-		/path/to/index.xml
+	/usr/bin/openjade -t sgml \
+	  -d /usr/share/sgml/docbook/dsssl-stylesheets-1.78/html/blfs.dsl \
+	  /usr/share/sgml/docbook/dsssl-stylesheets-1.78/dtds/decls/xml.dcl \
+	  /path/to/index.xml
 
 
@@ -23,8 +23,8 @@
 The NOCHUNKS HTML version is one big HTML file:
 	/usr/bin/openjade -t sgml \
-		-V nochunks \
-		-d /usr/share/dsssl/docbook/html/blfs.dsl \
-		/usr/share/dsssl/docbook/dtds/decls/xml.dcl \
-		/path/to/index.xml > nochunks.html
+	 -V nochunks \
+	 -d /usr/share/sgml/docbook/dsssl-stylesheets-1.78/html/blfs.dsl \
+         /usr/share/sgml/docbook/dsssl-stylesheets-1.78/dtds/decls/xml.dcl \
+	 /path/to/index.xml > nochunks.html
 
 XML to TXT:
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/gnet.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -5,5 +5,4 @@
 &gnet-intro;
 &gnet-inst;
-&gnet-exp;
 &gnet-desc;
 
Index: basicnet/netlibs/gnet/gnet-config.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-config.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/gnet/gnet-config.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring gnet</title>
+<title>Configuring <application>gnet</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/netlibs/gnet/gnet-desc.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-desc.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/gnet/gnet-desc.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -2,5 +2,5 @@
 <title>Contents</title>
 
-<para>The gnet package contains <filename>libgnet</filename> libraries.</para>
+<para>The <application>gnet</application> package contains <filename>libgnet</filename> libraries.</para>
 
 </sect2>
Index: basicnet/netlibs/gnet/gnet-exp.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-exp.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/gnet/gnet-exp.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -2,7 +2,9 @@
 <title>Command explanations</title>
 
-<para><userinput>--enable-glib2</userinput> : This switch ensures that
-gnet will link against GLib2.  Configure defaults to GLib, if it is
-installed, instead of GLib2.</para>
+<para><command>--enable-glib2</command> : This switch ensures that
+<application>gnet</application> will link against
+<applicatin>GLib</application> version 2.  Configure defaults to
+<application>GLib</application>, if it is
+installed, instead of <application>GLib</application> version 2.</para>
 
 </sect2>
Index: basicnet/netlibs/gnet/gnet-inst.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-inst.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/gnet/gnet-inst.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of gnet</title>
+<title>Installation of <application>gnet</application></title>
 
-<para>Install gnet by running the following commands:</para>
+<para>Install <application>gnet</application> by running the following commands:
+</para>
 
-<para><screen><userinput>./configure --prefix=/usr --enable-glib2 &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr  &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netlibs/gnet/gnet-intro.xml
===================================================================
--- basicnet/netlibs/gnet/gnet-intro.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/gnet/gnet-intro.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -1,18 +1,29 @@
 <sect2>
-<title>Introduction to gnet</title>
+<title>Introduction to <application>gnet</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gnet-download-http;"/>
-Download location (FTP):        <ulink url="&gnet-download-ftp;"/>
-Version used:                   &gnet-version;
-Package size:                   &gnet-size;
-Estimated Disk space required:  &gnet-buildsize;
-Estimated build time:           &gnet-time;</screen>
 
-<para>The gnet package contains a simple network library. This is useful
-for supporting TCP sockets, UDP and IP multicast, asynchronous DNS
-lookup, and more.</para>
+<para>The <application>gnet</application> package contains a simple network 
+library. This is useful for supporting <acronym>TCP</acronym> sockets,
+<acronym>UDP</acronym> and <acronym>IP</acronym> multicast, asynchronous 
+<acronym>DNS</acronym> lookup, and more.</para>
 
-<screen>gnet depends on:
-<xref linkend="GLib2"/></screen>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gnet-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gnet-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gnet-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gnet-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gnet-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>gnet</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GLib2"/></para></sect4>
+</sect3>
+
 
 </sect2>
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ basicnet/netlibs/netlibs.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -6,4 +6,5 @@
 &wvstreams;
 &gnet;
+&libsoup;
 
 </chapter>
Index: connect/dhcp/dhcpcd/dhcpcd.ent
===================================================================
--- connect/dhcp/dhcpcd/dhcpcd.ent	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ connect/dhcp/dhcpcd/dhcpcd.ent	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -7,5 +7,5 @@
 <!ENTITY dhcpcd-buildsize "750 KB">
 <!ENTITY dhcpcd-version "1.3.22-pl4">
-<!ENTITY dhcpcd-download-http "">
+<!ENTITY dhcpcd-download-http "http://www.phystech.com/ftp/dhcpcd-1.3.22-pl4.tar.gz">
 <!ENTITY dhcpcd-download-ftp "ftp://ftp.phystech.com/pub/dhcpcd-1.3.22-pl4.tar.gz">
 <!ENTITY dhcpcd-size "145 KB">
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ general/genlib/genlib.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -50,5 +50,4 @@
 &slib;
 &gwrap;
-&libsoup;
 &STLport;
 &LZO;
Index: gnome/lib/gconf/gconf1-config.xml
===================================================================
--- gnome/lib/gconf/gconf1-config.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ gnome/lib/gconf/gconf1-config.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring GConf</title>
+<title>Configuring <application>GConf</application></title>
 
 <sect3><title>Configuration Information</title>
Index: gnome/lib/gconf/gconf1-desc.xml
===================================================================
--- gnome/lib/gconf/gconf1-desc.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ gnome/lib/gconf/gconf1-desc.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The GConf package contains <filename>libgconf</filename> libraries.</para>
+<para>The <application>GConf</application> package contains <filename>libgconf
+</filename> libraries.</para>
 
 </sect2>
@@ -9,6 +10,6 @@
 
 <sect3><title>libgconf libraries</title>
-<para>libgconf libraries provide the functions necessary to maintain
-the configuration database.</para></sect3>
+<para><filename>libgconf</filename> libraries provide the functions necessary 
+to maintain the configuration database.</para></sect3>
 
 
Index: gnome/lib/gconf/gconf1-inst.xml
===================================================================
--- gnome/lib/gconf/gconf1-inst.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ gnome/lib/gconf/gconf1-inst.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of GConf</title>
+<title>Installation of <application>GConf</application></title>
 
-<para>Install GConf by running the following commands:</para>
+<para>Install <application>GConf</application> by running the following commands:
+</para>
 
-<para><screen><userinput>./configure --prefix=/opt/gnome &amp;&amp;
+<screen><userinput><command>./configure --prefix=/opt/gnome &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: gnome/lib/gconf/gconf1-intro.xml
===================================================================
--- gnome/lib/gconf/gconf1-intro.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ gnome/lib/gconf/gconf1-intro.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -1,17 +1,28 @@
 <sect2>
-<title>Introduction to GConf</title>
+<title>Introduction to <application>GConf</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&GConf1-download-http;"/>
-Download location (FTP):        <ulink url="&GConf1-download-ftp;"/>
-Version used:                   &GConf1-version;
-Package size:                   &GConf1-size;
-Estimated Disk space required:  &GConf1-buildsize;</screen>
+<para>The <application>GConf</application> package contains a configuration 
+database system.</para>
 
-<para>The GConf package contains a configuration database system.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&GConf1-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&GConf1-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &GConf1-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&GConf1-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&GConf1-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>GConf</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="oaf"/>, <xref linkend="GTK"/> and <xref linkend="gdk"/></para></sect4>
+<sect4><title>Optional</title>
+<para><xref linkend="db-3.3"/> and <xref linkend="guile"/></para></sect4>
+</sect3>
 
-<screen>GConf depends on:
-<xref linkend="oaf"/>, <xref linkend="GTK"/> and <xref linkend="gdk"/>
-GConf will utilize:
-<xref linkend="db-3.3"/> and <xref linkend="guile"></xref></screen>
 
 </sect2>
Index: gnome/lib/gconf/gconf1.ent
===================================================================
--- gnome/lib/gconf/gconf1.ent	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ gnome/lib/gconf/gconf1.ent	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -5,7 +5,8 @@
 <!ENTITY GConf1-desc SYSTEM "gconf1-desc.xml">
 <!ENTITY GConf1-config SYSTEM "gconf1-config.xml">
-<!ENTITY GConf1-buildsize "8.7 MB">
+<!ENTITY GConf1-buildsize "20.0 MB">
 <!ENTITY GConf1-version "1.0.9">
 <!ENTITY GConf1-download-http "http://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-1.0.9.tar.bz2">
 <!ENTITY GConf1-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/GConf/1.0/GConf-1.0.9.tar.bz2">
-<!ENTITY GConf1-size "1.2 MB">
+<!ENTITY GConf1-size "772 KB">
+<!ENTITY GConf1-time "0.44">
Index: gnome/lib/gconf1.xml
===================================================================
--- gnome/lib/gconf1.xml	(revision 292bc8bf7159c329ecf1703bebd7c00679a8bd7d)
+++ gnome/lib/gconf1.xml	(revision 5e199336133fcd285a029b58e77c94679352e2ba)
@@ -5,5 +5,4 @@
 &GConf1-intro;
 &GConf1-inst;
-&GConf1-config;
 &GConf1-desc;
 
