Index: basicnet/textweb/lynx/lynx-config.xml
===================================================================
--- basicnet/textweb/lynx/lynx-config.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ basicnet/textweb/lynx/lynx-config.xml	(revision fcf5308c8a3663f10b2fc4df7ce0c4ee6781126a)
@@ -1,4 +1,4 @@
 <sect2>
-<title>Configuring lynx</title>
+<title>Configuring <application>lynx</application></title>
 
 <sect3><title>Config files</title>
Index: basicnet/textweb/lynx/lynx-desc.xml
===================================================================
--- basicnet/textweb/lynx/lynx-desc.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ basicnet/textweb/lynx/lynx-desc.xml	(revision fcf5308c8a3663f10b2fc4df7ce0c4ee6781126a)
@@ -2,5 +2,6 @@
 <title>Contents</title>
 
-<para>The lynx package contains <userinput>lynx</userinput>.</para>
+<para>The <application>lynx</application> package contains <command>lynx
+</command>.</para>
 
 </sect2>
@@ -9,6 +10,6 @@
 
 <sect3><title>lynx</title>
-<para>lynx is a general purpose, text-based, distributed information browser 
-for the World Wide Web.</para></sect3>
+<para><command>lynx</command> is a general purpose, text-based, distributed 
+information browser for the World Wide Web.</para></sect3>
 
 </sect2>
Index: basicnet/textweb/lynx/lynx-exp.xml
===================================================================
--- basicnet/textweb/lynx/lynx-exp.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ basicnet/textweb/lynx/lynx-exp.xml	(revision fcf5308c8a3663f10b2fc4df7ce0c4ee6781126a)
@@ -2,22 +2,22 @@
 <title>Command explanations</title>
 
-<para><userinput>--libdir=/etc</userinput> : For some reason, the
+<para><command>--libdir=/etc</command> : For some reason, the
 configure and make routine for lynx uses libdir as the prefix for the
-configuration file.  We set this to <filename>/etc</filename> so that the system wide
-configuration file is <filename>/etc/lynx.cfg</filename>.</para>
+configuration file.  We set this to <filename>/etc</filename> so that the 
+system wide configuration file is <filename>/etc/lynx.cfg</filename>.</para>
 
-<para><userinput>--with-ssl</userinput> : This enables support for
-linking SSL into lynx.</para>
+<para><command>--with-ssl</command> : This enables support for
+linking <acronym>SSL</acronym> into <application>lynx</application>.</para>
 
-<para><userinput>--with-zlib</userinput> : This enables support for
-linking zlib into lynx.</para>
+<para><command>--with-zlib</command> : This enables support for
+linking <application>zlib</application> into <application>lynx</application>.</para>
 
-<para><userinput>DOCDIR=... HELPDIR=...</userinput> : We set these
+<para><command>DOCDIR=... HELPDIR=...</command> : We set these
 variables to avoid getting the help and documentation files installed
 under <filename>/etc</filename>.</para>
 
-<para><userinput>sed... mv /etc/lynx.bak /etc/lynx.cfg</userinput> : This 
-sed command changes the <filename>/etc/lynx.cfg</filename> file so it looks for the help
-files in the correct place.</para>
+<para><command>sed... mv /etc/lynx.bak /etc/lynx.cfg</command> : This 
+<command>sed</command> command changes the <filename>/etc/lynx.cfg</filename> 
+file so it looks for the help files in the correct place.</para>
 
 </sect2>
Index: basicnet/textweb/lynx/lynx-inst.xml
===================================================================
--- basicnet/textweb/lynx/lynx-inst.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ basicnet/textweb/lynx/lynx-inst.xml	(revision fcf5308c8a3663f10b2fc4df7ce0c4ee6781126a)
@@ -1,8 +1,9 @@
 <sect2>
-<title>Installation of lynx</title>
+<title>Installation of <application>lynx</application></title>
 
-<para>Install lynx by running the following commands.</para>
+<para>Install <application>lynx</application> by running the following commands.
+</para>
 
-<para><screen><userinput>./configure --prefix=/usr --libdir=/etc --with-ssl --with-zlib &amp;&amp;
+<screen><userinput><command>./configure --prefix=/usr --libdir=/etc --with-ssl --with-zlib &amp;&amp;
 make &amp;&amp;
 make install &amp;&amp;
@@ -13,5 +14,5 @@
 sed s/"t\/etc"/"t\/usr\/share\/doc\/lynx\-2\.8\.4"/ \
 &nbsp;&nbsp;&nbsp;/etc/lynx.cfg &gt; /etc/lynx.bak &amp;&amp;
-mv /etc/lynx.bak /etc/lynx.cfg</userinput></screen></para>
+mv /etc/lynx.bak /etc/lynx.cfg</command></userinput></screen>
 
 </sect2>
Index: basicnet/textweb/lynx/lynx-intro.xml
===================================================================
--- basicnet/textweb/lynx/lynx-intro.xml	(revision 1aacd4b52efed0dcbfb1ea8fc12d47d362bad944)
+++ basicnet/textweb/lynx/lynx-intro.xml	(revision fcf5308c8a3663f10b2fc4df7ce0c4ee6781126a)
@@ -1,15 +1,25 @@
 <sect2>
-<title>Introduction to lynx</title>
+<title>Introduction to <application>lynx</application></title>
 
-<screen>Download location (HTTP):       <ulink url="&lynx-download-http;"/>
-Download location (FTP):        <ulink url="&lynx-download-ftp;"/>
-Version used:                   &lynx-version;
-Package size:                   &lynx-size;
-Estimated Disk space required:  &lynx-buildsize;</screen>
+<para><application>Lynx</application> is a text based web browser.</para>
 
-<para>Lynx is a text based web browser.</para>
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&lynx-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&lynx-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &lynx-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&lynx-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&lynx-time;</para></listitem></itemizedlist>
+</sect3>
 
-<screen>lynx depends on:
-<xref linkend="openssl"></xref></screen>
+<sect3><title><application>lynx</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="openssl"/></para></sect4>
+</sect3>
+
 
 </sect2>
