Index: general/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap.xml	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -6,5 +6,4 @@
 &gwrap-inst;
 &gwrap-exp;
-&gwrap-config;
 &gwrap-desc;
 
Index: general/genlib/gwrap/gwrap-config.xml
===================================================================
--- general/genlib/gwrap/gwrap-config.xml	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap/gwrap-config.xml	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring G-Wrap</title>
+<title>Configuring <application>G-Wrap</application></title>
 
 &library-config;
Index: general/genlib/gwrap/gwrap-desc.xml
===================================================================
--- general/genlib/gwrap/gwrap-desc.xml	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap/gwrap-desc.xml	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -2,5 +2,7 @@
 <title>Contents</title>
 
-<para>In addition to the Scheme libraries, the G-Wrap package contains <userinput>g-wrap-config.</userinput></para>
+<para>In addition to the <application>Scheme</application> libraries, the 
+<application>G-Wrap</application> package contains
+<command>g-wrap-config</command>.</para>
 
 </sect2>
@@ -9,6 +11,7 @@
 
 <sect3><title>g-wrap-config</title>
-<para>g-wrap-config is a tool to generate CFLAGS for linking C code to
-the Scheme runtime libraries.</para></sect3>
+<para><command>g-wrap-config</command> is a tool to generate <envar>CFLAGS
+</envar> for linking <application>C</application> code to the
+<application>Scheme</application> runtime libraries.</para></sect3>
 
 </sect2>
Index: general/genlib/gwrap/gwrap-exp.xml
===================================================================
--- general/genlib/gwrap/gwrap-exp.xml	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap/gwrap-exp.xml	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -2,6 +2,7 @@
 <title>Command explanations</title>
 
-<para><userinput>--prefix=/usr</userinput> : Change the g-wrap default
-installation directory of <filename>/usr/local</filename>.</para>
+<para><command>--prefix=/usr</command> : Change the <application>g-wrap
+</application> default installation directory of <filename>/usr/local
+</filename>.</para>
 
 </sect2>
Index: general/genlib/gwrap/gwrap-inst.xml
===================================================================
--- general/genlib/gwrap/gwrap-inst.xml	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap/gwrap-inst.xml	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -1,10 +1,11 @@
 <sect2>
-<title>Installation of G-Wrap</title>
+<title>Installation of <application>G-Wrap</application></title>
 
-<para>Install G-Wrap by running the following commands:</para>
+<para>Install <application>G-Wrap</application> by running the following 
+commands:</para>
 
-<para><screen><userinput>./configure --prefix=/usr &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: general/genlib/gwrap/gwrap-intro.xml
===================================================================
--- general/genlib/gwrap/gwrap-intro.xml	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap/gwrap-intro.xml	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -1,16 +1,27 @@
 <sect2>
-<title>Introduction to G-Wrap</title>
+<title>Introduction to <application>G-Wrap</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&gwrap-download-http;"/>
-Download location (FTP):        <ulink url="&gwrap-download-ftp;"/>
-Version used:                   &gwrap-version;
-Package size:                   &gwrap-size;
-Estimated Disk space required:  &gwrap-buildsize;</screen>
+<para>The <application>G-Wrap</application> package contains tools for 
+exporting <application>C</application> libraries into <application>Scheme
+</application> interpreters.</para>
 
-<para>The G-Wrap package contains tools for exporting C libraries into
-Scheme interpreters.</para> 
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gwrap-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gwrap-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gwrap-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gwrap-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gwrap-time;</para></listitem></itemizedlist>
+</sect3>
+                                                                                
+<sect3><title><application>G-wrap</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="guile"/> and <xref linkend="slib"/></para></sect4>
+</sect3>
 
-<screen>G-Wrap depends on:
-<xref linkend="guile"></xref> and <xref linkend="slib"></xref></screen>
 
 </sect2>
Index: general/genlib/gwrap/gwrap.ent
===================================================================
--- general/genlib/gwrap/gwrap.ent	(revision 6aa5714df4df4f88c3eb73a52e43e92e2bc38163)
+++ general/genlib/gwrap/gwrap.ent	(revision c37e15f0865cea6f31f43f8f25eed40ac7ae0b7c)
@@ -10,2 +10,3 @@
 <!ENTITY gwrap-download-ftp "">
 <!ENTITY gwrap-size "400 KB">
+<!ENTITY gwrap-time "0.09">
