Index: basicnet/netlibs/wvstreams.xml
===================================================================
--- basicnet/netlibs/wvstreams.xml	(revision ddee925d3c586e4fceb227c387e2a4e5a117d9f5)
+++ basicnet/netlibs/wvstreams.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
@@ -5,4 +5,5 @@
 &wvstreams-intro;
 &wvstreams-inst;
+&wvstreams-exp;
 &wvstreams-config;
 &wvstreams-desc;
Index: basicnet/netlibs/wvstreams/wvstreams-desc.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision ddee925d3c586e4fceb227c387e2a4e5a117d9f5)
+++ basicnet/netlibs/wvstreams/wvstreams-desc.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
@@ -3,7 +3,7 @@
 
 <para>The wvstreams package contains the
-<filename>libwvcrypto</filename> libraries,
-<filename>libwvstreams</filename> libraries and
-<filename>libwvutils</filename> libraries.</para>
+<filename class="libraryfile">libwvcrypto</filename>,
+<filename class="libraryfile">libwvstreams</filename> and
+<filename class="libraryfile">libwvutils</filename> libraries.</para>
 
 </sect2>
@@ -12,11 +12,14 @@
 
 <sect3><title>wvcrypto</title>
-<para>No description is currently available.</para></sect3>
+<para><filename class="libraryfile">libwvcrypto</filename> defines 
+streams with built-in cryptography.</para></sect3>
 
 <sect3><title>wvstreams</title>
-<para>No description is currently available.</para></sect3>
+<para><filename class="libraryfile">libwvstreams</filename> defines the 
+basic properties of a stream.</para></sect3>
 
 <sect3><title>wvutils</title>
-<para>No description is currently available.</para></sect3>
+<para><filename class="libraryfile">libwvutils</filename> contains 
+fundamental support utilites.</para></sect3>
 
 </sect2>
Index: basicnet/netlibs/wvstreams/wvstreams-exp.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/netlibs/wvstreams/wvstreams-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
@@ -0,0 +1,8 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><command>make PREFIX=/usr LDFLAGS="-lcrypt"</command> : 
+This fixes <filename class="libraryfile">libwvstreams</filename>' issues 
+with OpenSSL's crypto library.</para>
+
+</sect2>
Index: basicnet/netlibs/wvstreams/wvstreams-inst.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision ddee925d3c586e4fceb227c387e2a4e5a117d9f5)
+++ basicnet/netlibs/wvstreams/wvstreams-inst.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
@@ -1,15 +1,11 @@
 <sect2>
-<title>Installation of wvstreams</title>
+<title>Installation of <application>wvstreams</application></title>
 
-<para>Download the wvstreams patches from <ulink url="&hfile-root;"/>.
-The wvcrypto patch is only necessary for
-<application>openssl-0.9.7</application> or greater.</para>
+<para>Install <application>wvstreams</application> by running the following commands:</para>
 
-<para>Install wvstreams by running the following commands:</para>
-
-<para><screen><userinput>patch -Np1 -i ../wvstreams-3.70-wvcrypto.patch &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../wvstreams-3.70-wvcrypto.patch &amp;&amp;
 patch -Np1 -i ../wvstreams-3.70-wvresolver.patch &amp;&amp;
 make PREFIX=/usr LDFLAGS="-lcrypt" &amp;&amp;
-make PREFIX=/usr install</userinput></screen></para>
+make PREFIX=/usr install</command></userinput></screen>
 
 </sect2>
Index: basicnet/netlibs/wvstreams/wvstreams-intro.xml
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision ddee925d3c586e4fceb227c387e2a4e5a117d9f5)
+++ basicnet/netlibs/wvstreams/wvstreams-intro.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
@@ -1,16 +1,30 @@
 <sect2>
-<title>Introduction to wvstreams</title>
+<title>Introduction to <application>wvstreams</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&wvstreams-download-http;"/>
-Download location (FTP):        <ulink url="&wvstreams-download-ftp;"/>
-Version used:                   &wvstreams-version;
-Package size:                   &wvstreams-size;
-Estimated Disk space required:  &wvstreams-buildsize;</screen>
+<para>The <application>wvstreams</application> package contains the 
+network programming libraries. These are needed to compile wvdial.</para>
 
-<para>The wvstreams package contains the libwvutils, libwvstreams and
-libwvcrypto libraries.  These are needed 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>
 
-<screen>wvstreams depends on:
-<xref linkend="openssl"/> to build the wvcrypto library</screen>
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch: <ulink
+url="&hfile-root;/wvstreams-&wvstreams-version;-wvcrypto.patch"/></para></listitem>
+<listitem><para>Required Patch: <ulink
+url="&hfile-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>
Index: basicnet/netlibs/wvstreams/wvstreams.ent
===================================================================
--- basicnet/netlibs/wvstreams/wvstreams.ent	(revision ddee925d3c586e4fceb227c387e2a4e5a117d9f5)
+++ basicnet/netlibs/wvstreams/wvstreams.ent	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
@@ -2,9 +2,12 @@
 <!ENTITY wvstreams-intro SYSTEM "wvstreams-intro.xml">
 <!ENTITY wvstreams-inst SYSTEM "wvstreams-inst.xml">
+<!ENTITY wvstreams-exp SYSTEM "wvstreams-exp.xml">
 <!ENTITY wvstreams-desc SYSTEM "wvstreams-desc.xml">
 <!ENTITY wvstreams-config SYSTEM "wvstreams-config.xml">
-<!ENTITY wvstreams-buildsize "9.6 MB">
+<!ENTITY wvstreams-buildsize "11.5 MB">
 <!ENTITY wvstreams-version "3.70">
-<!ENTITY wvstreams-download-http "http://open.nit.ca/download/wvstreams-3.70.tar.gz">
+<!ENTITY wvstreams-download-http
+"http://open.nit.ca/download/wvstreams-&wvstreams-version;.tar.gz">
 <!ENTITY wvstreams-download-ftp "">
 <!ENTITY wvstreams-size "178 KB">
+<!ENTITY wvstreams-time "0.17 SBU">
