Index: basicnet/textweb/w3m.xml
===================================================================
--- basicnet/textweb/w3m.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -5,6 +5,6 @@
 &w3m-intro;
 &w3m-inst;
+&w3m-exp;
 &w3m-config;
-&w3m-exp;
 &w3m-desc;
 
Index: basicnet/textweb/w3m/w3m-config.xml
===================================================================
--- basicnet/textweb/w3m/w3m-config.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m/w3m-config.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,22 +2,22 @@
 <title>Configuration</title>
 
-<para>w3m expects the GPM library to be located at
-<filename>/usr/lib/libgpm.so.1</filename>. To make w3m happy, we will
-create a symbolic link to the GPM library. You only need to do this if
-you compiled w3m with mouse support. To create this symbolic link, run
-the following command:</para>
+<para>If you compiled w3m with mouse support then you must create a symbolic
+link to the <acronym>GPM</acronym> library because w3m expects it to be
+located at <filename>/usr/lib/libgpm.so.1</filename>. To create this symbolic 
+link run the following command:</para>
 
-<para><screen><userinput>ln -sf /usr/lib/libgpm.so.?.* /usr/lib/libgpm.so.1</userinput></screen></para>
+<screen><userinput><command>ln -sf /usr/lib/libgpm.so.?.* /usr/lib/libgpm.so.1</command>
+</userinput></screen>
 
 </sect2>
 
 <sect2>
-<title>Possible problems with GPM</title>
+<title>Possible problems with <acronym>GPM</acronym></title>
 
-<para>Depending on what version of GPM you are using, and whether or not
-any patches were applied to GPM, you might receive the following
+<para>Depending on what version of <acronym>GPM</acronym> you are using, and whether or not
+any patches were applied to <acronym>GPM</acronym>, you might receive the following
 warning when starting w3m:</para>
 
-<para><screen>*** debug ***: [/usr/src/gpm-1.20.0/src/liblow.c(202)]:</screen></para>
+<screen>*** debug ***: [/usr/src/gpm-1.20.0/src/liblow.c(202)]:</screen>
 
 <para>Currently, the only known solution to this problem is to disable
Index: basicnet/textweb/w3m/w3m-desc.xml
===================================================================
--- basicnet/textweb/w3m/w3m-desc.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m/w3m-desc.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,6 +2,6 @@
 <title>Contents</title>
 
-<para>The w3m package contains <userinput>w3m</userinput> and
-<userinput>w3mman</userinput>.</para>
+<para>The w3m package contains <command>w3m</command> and
+<command>w3mman</command>.</para>
 
 </sect2>
@@ -10,8 +10,8 @@
 
 <sect3><title>w3m</title>
-<para>w3m is a text based web browser and pager.</para></sect3>
+<para><command>w3m</command> is a text based web browser and pager.</para></sect3>
 
 <sect3><title>w3mman</title>
-<para>w3mman is an interface to the on-line reference manuals in
+<para><command>w3mman</command> is an interface to the on-line reference manuals in
 w3m.</para></sect3>
 
Index: basicnet/textweb/w3m/w3m-exp.xml
===================================================================
--- basicnet/textweb/w3m/w3m-exp.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m/w3m-exp.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -2,11 +2,11 @@
 <title>Command explanations</title>
 
-<para><userinput>./configure -yes</userinput> : Set all parameters to
+<para><command>./configure -yes</command> : Set all parameters to
 their default values.</para>
 
-<para><userinput>-lang=en</userinput> : Set the default language to
+<para><command>-lang=en</command> : Set the default language to
 English.</para>
 
-<para><userinput>-model=monster</userinput> : This sets the build model
+<para><command>-model=monster</command> : This sets the build model
 to monster. Alternative build models are discussed above.</para>
 
Index: basicnet/textweb/w3m/w3m-inst.xml
===================================================================
--- basicnet/textweb/w3m/w3m-inst.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m/w3m-inst.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,7 +1,7 @@
 <sect2>
-<title>Installation of w3m</title>
+<title>Installation of <application>w3m</application></title>
 
-<para>We configure w3m to use the "monster" model, which includes color,
-menu, mouse, cookie, and SSL support. Other models include:</para>
+<para>We configure <application>w3m</application> to use the "monster" model, which includes color,
+menu, mouse, cookie, and <acronym>SSL</acronym> support. Other models include:</para>
 
 <para><literallayout>baby   - bare minimum
@@ -10,9 +10,9 @@
 cookie - color, menu, mouse, and cookie support</literallayout></para>
 
-<para>Install w3m by running the following commands:</para>
+<para>Install <application>w3m</application> by running the following commands:</para>
 
-<para><screen><userinput>./configure -yes -lang=en -model=monster -prefix=/usr &amp;&amp;
+<screen><userinput><command>./configure -yes -lang=en -model=monster -prefix=/usr &amp;&amp;
 make &amp;&amp;
-make install</userinput></screen></para>
+make install</command></userinput></screen>
 
 </sect2>
Index: basicnet/textweb/w3m/w3m-intro.xml
===================================================================
--- basicnet/textweb/w3m/w3m-intro.xml	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m/w3m-intro.xml	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -1,12 +1,23 @@
 <sect2>
-<title>Introduction to w3m</title>
+<title>Introduction to <application>w3m</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&w3m-download-http;"/>
-Download location (FTP):        <ulink url="&w3m-download-ftp;"/>
-Version used:                   &w3m-version;
-Package size:                   &w3m-size;
-Estimated Disk space required:  &w3m-buildsize;</screen>
+<para><application>w3m</application> is primarily a pager but it can also be used as a text-mode
+<acronym>WWW</acronym> browser.</para>
 
-<para>w3m is a text based web browser and pager.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink url="&w3m-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink url="&w3m-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &w3m-size;</para></listitem>
+<listitem><para>Estimated Disk space required: &w3m-buildsize;</para></listitem>
+<listitem><para>Estimated build time: &w3m-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application>w3m</application> dependencies</title>
+<sect4><title>Optional</title>
+<para><xref linkend="gpm"/>, <xref linkend="openssl"/>, <xref
+linkend="imlib"/>, <xref linkend="gdk"/> and <xref
+linkend="compface"/></para></sect4>
+</sect3>
 
 </sect2>
Index: basicnet/textweb/w3m/w3m.ent
===================================================================
--- basicnet/textweb/w3m/w3m.ent	(revision a2d48f42e9beaa74dc51705172007b8fc979fbc7)
+++ basicnet/textweb/w3m/w3m.ent	(revision ff0741276bc9dde5ed4fd975282e8cdd28c4e489)
@@ -5,7 +5,8 @@
 <!ENTITY w3m-exp SYSTEM "w3m-exp.xml">
 <!ENTITY w3m-desc SYSTEM "w3m-desc.xml">
-<!ENTITY w3m-buildsize "3 MB">
-<!ENTITY w3m-version "0.3.2.1">
+<!ENTITY w3m-buildsize "8.2 MB">
+<!ENTITY w3m-version "0.4.1">
 <!ENTITY w3m-download-http "http://unc.dl.sourceforge.net/sourceforge/w3m/w3m-&w3m-version;.tar.gz">
 <!ENTITY w3m-download-ftp "">
-<!ENTITY w3m-size "1.1 MB">
+<!ENTITY w3m-size "1.2 MB">
+<!ENTITY w3m-time "0.20 SBU">
