Index: basicnet/basicnet.xml
===================================================================
--- basicnet/basicnet.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ basicnet/basicnet.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -3,5 +3,7 @@
 <title>Basic Networking</title>
 
-&basicnet-netlibs;
+
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="basicnet/netlibs/netlibs.xml"/>  
+
 &basicnet-textweb;
 &basicnet-netprogs;
Index: basicnet/netlibs/curl.xml
===================================================================
--- basicnet/netlibs/curl.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ basicnet/netlibs/curl.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -1,10 +1,90 @@
+<!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 curl-download-http "http://curl.haxx.se/download/curl-&curl-version;.tar.bz2">
+  <!ENTITY curl-download-ftp  " ">
+  <!ENTITY curl-size          "1.4 MB">
+  <!ENTITY curl-buildsize     "26.6 MB">
+  <!ENTITY curl-time          "0.43 SBU">
+]>
+
 <sect1 id="curl" xreflabel="cURL-&curl-version;">
 <?dbhtml filename="curl.html"?>
 <title>cURL-&curl-version;</title>
 
-&curl-intro;
-&curl-inst;
-&curl-exp;
-&curl-desc;
+<sect2>
+<title>Introduction to <application>cURL</application></title>
+
+<para>The <application>cURL</application> package contains <command>curl</command> and its
+support library. This is useful for transferring files with
+<acronym>URL</acronym> syntax.  This ability to both download and 
+redirect files can be incorporated into other programs to support 
+functions like streaming media.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&curl-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&curl-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &curl-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &curl-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &curl-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>cURL</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="openssl"/>, <xref linkend="openldap"/> and <xref
+linkend="mitkrb"/> or <xref linkend="heimdal"/></para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>cURL</application></title>
+
+<para>Install <application>cURL</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>Command explanations</title>
+
+<para><parameter>--with-gssapi=/usr</parameter>: 
+This parameter adds kerberos 5 support to <filename
+class="libraryfile">libcurl</filename>.</para>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>cURL</application> package contains <command>curl</command>, <command>curl-config</command> and the
+<filename class="libraryfile">libcurl</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>curl</title>
+<para><command>curl</command> is a client that can get documents from or send documents to
+any of the following protocols: <acronym>HTTP</acronym>,
+<acronym>HTTPS</acronym> (needs <xref linkend="openssl"/>),
+<acronym>FTP</acronym>, GOPHER, DICT, TELNET, <acronym>LDAP</acronym> (needs <xref
+linkend="openldap"/>) or FILE.</para></sect3>
+
+<sect3><title>curl-config</title>
+<para><command>curl-config</command> prints information about the last compile, like
+libraries linked to and prefix setting.</para></sect3>
+
+<sect3><title>libcurl</title>
+<para><filename class="libraryfile">libcurl</filename> provides the functionality of 
+<command>curl</command> to other programs.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netlibs/gnet.xml
===================================================================
--- basicnet/netlibs/gnet.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ basicnet/netlibs/gnet.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -1,9 +1,65 @@
+<!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 gnet-download-http "http://gnetlibrary.org/src/gnet-&gnet-version;.tar.gz">
+  <!ENTITY gnet-download-ftp  " ">
+  <!ENTITY gnet-size          "412 KB">
+  <!ENTITY gnet-buildsize     "9.6 MB">
+  <!ENTITY gnet-time          "0.18 SBU">
+]>
+
 <sect1 id="gnet" xreflabel="GNet-&gnet-version;">
 <?dbhtml filename="gnet.html"?>
 <title>GNet-&gnet-version;</title>
 
-&gnet-intro;
-&gnet-inst;
-&gnet-desc;
+<sect2>
+<title>Introduction to <application>GNet</application></title>
+
+<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>
+
+<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>
+
+<sect2>
+<title>Installation of <application>GNet</application></title>
+
+<para>Install <application>GNet</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>Contents</title>
+
+<para>The <application>GNet</application> package contains <filename>libgnet</filename> libraries.</para>
+
+</sect2>
 
 </sect1>
Index: basicnet/netlibs/libsoup.xml
===================================================================
--- basicnet/netlibs/libsoup.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ basicnet/netlibs/libsoup.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -1,9 +1,82 @@
+<!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 libsoup-download-http "http://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
+  <!ENTITY libsoup-download-ftp  "ftp://ftp.gnome.org/pub/gnome/sources/libsoup/1.99/libsoup-&libsoup-version;.tar.bz2">
+  <!ENTITY libsoup-size          "365 KB">
+  <!ENTITY libsoup-buildsize     "13 MB">
+  <!ENTITY libsoup-time          "0.41 SBU">
+]>
+
 <sect1 id="libsoup" xreflabel="libsoup-&libsoup-version;">
 <?dbhtml filename="libsoup.html"?>
 <title>libsoup-&libsoup-version;</title>
 
-&libsoup-intro;
-&libsoup-inst;
-&libsoup-desc;
+<sect2>
+<title>Introduction to <application>libsoup</application></title>
+
+<para>The <application>libsoup</application> package contains an
+<acronym>HTTP</acronym> library implementation in
+<application>C</application>.  This is useful for accessing
+<acronym>HTTP</acronym> servers in a completely asynchronous mode.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&libsoup-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&libsoup-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &libsoup-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &libsoup-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &libsoup-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>libsoup</application> dependencies</title>
+<sect4><title>Required</title>
+<para>
+<xref linkend="GLib2"/> and
+<xref linkend="libxml2"/>
+</para></sect4>
+<sect4><title>Optional</title>
+<para>
+<xref linkend="gtk-doc"/> and 
+<ulink url="http://www.gnu.org/software/gnutls/">GnuTLS</ulink> (which
+needs <ulink
+url="ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/">libgpg-error</ulink>,
+<ulink url="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink> and
+<ulink
+url="ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/">opencdk</ulink>,
+in that order.)
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>libsoup</application></title>
+
+<para>Install <application>libsoup</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/sbin &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>libsoup</application> package contains 
+<filename class="libraryfile">libsoup</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libsoup libraries</title>
+<para><filename class="libraryfile">libsoup</filename> libraries provide functions for
+asynchronous <acronym>HTTP</acronym> connections.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: basicnet/netlibs/netlibs.xml
===================================================================
--- basicnet/netlibs/netlibs.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ basicnet/netlibs/netlibs.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -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-netlibs">
 <?dbhtml filename="netlibs.html"?>
@@ -9,9 +16,8 @@
 
 
-
-&curl;
-&wvstreams;
-&gnet;
-&libsoup;
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="curl.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="wvstreams.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gnet.xml"/> 
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libsoup.xml"/> 
 
 </chapter>
Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ basicnet/netlibs/wvstreams.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -1,11 +1,113 @@
+<!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 wvstreams-download-http "http://open.nit.ca/download/wvstreams-&wvstreams-version;.tar.gz">
+  <!ENTITY wvstreams-download-ftp  "ftp://ftp.ing-steen.se/pub/unix/unsort/wvstreams-&wvstreams-version;.tar.gz">
+  <!ENTITY wvstreams-size          "178 KB">
+  <!ENTITY wvstreams-buildsize     "11.5 MB">
+  <!ENTITY wvstreams-time          "0.17 SBU">
+]>
+
 <sect1 id="wvstreams" xreflabel="WvStreams-&wvstreams-version;">
 <?dbhtml filename="wvstreams.html"?>
 <title>WvStreams-&wvstreams-version;</title>
 
-&wvstreams-intro;
-&wvstreams-inst;
-&wvstreams-exp;
-&wvstreams-config;
-&wvstreams-desc;
+<sect2>
+<title>Introduction to <application>WvStreams</application></title>
+
+<para>The <application>WvStreams</application> package contains the 
+network programming libraries required to compile wvdial.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&wvstreams-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&wvstreams-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &wvstreams-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &wvstreams-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &wvstreams-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink
+url="&patch-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/></para></listitem>
+<listitem><para>Required Patch: <ulink
+url="&patch-root;/wvstreams-&wvstreams-version;-wvresolver.patch"/></para></listitem>
+</itemizedlist></sect3>
+
+<sect3><title><application>WvStreams</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="openssl"/>
+</para></sect4>
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Installation of <application>WvStreams</application></title>
+
+<para>Install <application>WvStreams</application> by running the following commands:</para>
+
+<screen><userinput><command>patch -Np1 -i ../wvstreams-&wvstreams-version;-wvcrypto.patch &amp;&amp;
+patch -Np1 -i ../wvstreams-&wvstreams-version;-wvresolver.patch &amp;&amp;
+make PREFIX=/usr LDFLAGS="-lcrypt" &amp;&amp;
+make PREFIX=/usr install</command></userinput></screen>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>make PREFIX=/usr LDFLAGS="-lcrypt"</parameter>: 
+This fixes <filename class="libraryfile">libwvstreams</filename>' issues 
+with <application>Open<acronym>SSL</acronym></application>'s crypto library.</para>
+
+</sect2>
+
+<sect2>
+<title>Command explanations</title>
+
+<para><parameter>make PREFIX=/usr LDFLAGS="-lcrypt"</parameter>: 
+This fixes <filename class="libraryfile">libwvstreams</filename>' issues 
+with <application>Open<acronym>SSL</acronym></application>'s crypto library.</para>
+
+</sect2>
+
+<sect2>
+<title>Configuring <application>WvStreams</application></title>
+
+<sect3><title>Configuration Information</title>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>  
+</sect3>
+
+</sect2>
+
+<sect2>
+<title>Contents</title>
+
+<para>The <application>WvStreams</application> package contains the
+<filename class="libraryfile">libwvcrypto</filename>,
+<filename class="libraryfile">libwvstreams</filename> and
+<filename class="libraryfile">libwvutils</filename> libraries.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>libwvcrypto</title>
+<para><filename class="libraryfile">libwvcrypto</filename> defines 
+streams with built-in cryptography.</para></sect3>
+
+<sect3><title>libwvstreams</title>
+<para><filename class="libraryfile">libwvstreams</filename> defines the 
+basic properties of a stream.</para></sect3>
+
+<sect3><title>libwvutils</title>
+<para><filename class="libraryfile">libwvutils</filename> contains 
+fundamental support utilities.</para></sect3>
+
+</sect2>
 
 </sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 246c904b82dfea1a2752df2d957cb58ec6b352e6)
+++ general.ent	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -33,5 +33,5 @@
 
 <!-- Chapter 5 -->
-<!ENTITY reiser-version    "3.6.17"> 
+<!ENTITY reiser-version    "3.6.14"> 
 <!ENTITY xfsprogs-version  "2.6.13">
 
@@ -40,5 +40,5 @@
 <!ENTITY emacs-version     "21.3">  
 <!ENTITY nano-version      "1.2.3">  
-<!ENTITY joe-version       "3.1"> 
+<!ENTITY joe-version       "3.0"> 
 
 <!-- Chapter 7 -->
@@ -62,4 +62,21 @@
 <!ENTITY pppoe-version     "3.5"> 
 
+<!-- Chapter 16 -->
+<!ENTITY curl-version      "7.11.2"> 
+<!ENTITY wvstreams-version "3.70">  
+<!ENTITY gnet-version      "2.0.5">   
+<!ENTITY libsoup-version   "1.99.28"> 
+
+
+<!-- Chapter 17 -->
+
+
+<!-- Chapter 18 -->
+
+
+<!-- Chapter 19 -->
+
+
+<!-- Chapter 20 -->
 
 
Index: lib-config.xml
===================================================================
--- lib-config.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
+++ lib-config.xml	(revision a2d857216e75235c75bccc22220cb91a8bba85dc)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" >
+
+<para>As with most libraries, there is no configuration to do, save that the
+library directory i.e., <filename class="directory">/opt/lib</filename> or
+<filename class="directory">/usr/local/lib</filename> should appear in
+<filename>/etc/ld.so.conf</filename> so that <command>ldd</command> can find
+the shared libraries.  After checking that this is the case,
+<command>/sbin/ldconfig</command> should be run while logged in as root.</para>
