diff --git a/basicnet/textweb/lynx.xml b/basicnet/textweb/lynx.xml
index e53b65159e..a1f8f5827e 100644
--- a/basicnet/textweb/lynx.xml
+++ b/basicnet/textweb/lynx.xml
@@ -13,156 +13,178 @@
 ]>
 
 <sect1 id="lynx" xreflabel="Lynx-&lynx-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="lynx.html"?>
-<title>Lynx-&lynx-version;</title>
-<indexterm zone="lynx">
-<primary sortas="a-Lynx">Lynx</primary></indexterm>
+  <?dbhtml filename="lynx.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>Lynx-&lynx-version;</title>
+  
+  <indexterm zone="lynx">
+    <primary sortas="a-Lynx">Lynx</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application>Lynx</application></title>
+  <sect2 role="package">
+    <title>Introduction to Lynx</title>
+    
+    <para><application>Lynx</application> is a text based web browser.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <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 MD5 sum: &lynx-md5sum;</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>
+    
+    <bridgehead renderas="sect3">Lynx Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="openssl"/> or
+    <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> 
+    then <ulink url="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink>), 
+    <ulink url="../server/mail.html">MTA</ulink>, 
+    <xref linkend="zip"/>, <xref linkend="unzip"/>, 
+    <xref linkend="slang"/>, <ulink
+    url="http://ftp.ibiblio.org/pub/linux/utils/compress/ncompress-4.2.4.tar.Z">
+    ncompress</ulink> and 
+    <ulink url="http://www.gnu.org/software/sharutils/">sharutils</ulink></para>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of Lynx</title>
 
-<para><application>Lynx</application> is a text based web browser.</para>
+    <para>Install <application>Lynx</application> by running the following 
+    commands:</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 MD5 sum: &lynx-md5sum;</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>
-
-<sect3><title><application>Lynx</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="openssl"/> or
-<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> 
-then <ulink url="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</ulink>), 
-<ulink url="../server/mail.html">MTA</ulink>, 
-<xref linkend="zip"/>, <xref linkend="unzip"/>, 
-<xref linkend="slang"/>, <ulink
-url="http://ftp.ibiblio.org/pub/linux/utils/compress/ncompress-4.2.4.tar.Z">
-ncompress</ulink> and 
-<ulink url="http://www.gnu.org/software/sharutils/">sharutils</ulink></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Lynx</application></title>
-
-<para>Install <application>Lynx</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr --libdir=/etc \
+<screen><userinput>./configure --prefix=/usr --libdir=/etc \
     --with-zlib --with-bzlib &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make install &amp;&amp;
+<screen role='root'><userinput>make install &amp;&amp;
 make docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc \
     helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help install-doc &amp;&amp;
 make docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc \
     helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help install-help &amp;&amp;
-chgrp -v -R root /usr/share/doc/lynx-&lynx-version;/lynx_doc</command></userinput></screen>
+chgrp -v -R root /usr/share/doc/lynx-&lynx-version;/lynx_doc</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+    
+    <para><parameter>--libdir=/etc</parameter>: For some reason, the
+    <command>configure</command> and <command>make</command> routine for 
+    <application>Lynx</application> uses <option>libdir</option> as the prefix for the
+    configuration file. This is set to <filename class="directory">/etc</filename> 
+    so that the system wide configuration file is 
+    <filename>/etc/lynx.cfg</filename>.</para>
+    
+    <para><parameter>--with-zlib</parameter>: This enables support for
+    linking <filename class="libraryfile">libz</filename> into 
+    <application>Lynx</application>.</para>
+    
+    <para><parameter>--with-bzlib</parameter>: This enables support for
+    linking <filename class="libraryfile">libbz2</filename> into 
+    <application>Lynx</application>.</para>
+    
+    <para><parameter>docdir=... helpdir=...</parameter>: These
+    variables are set to avoid getting the help and documentation files installed
+    under <filename class="directory">/etc</filename>.</para>
+    
+    <para><option>--with-ssl</option>: This enables support for
+    linking SSLl into <application>Lynx</application>.</para>
+    
+    <para><option>--with-gnutls</option>: This enables support for
+    linking <application>GnuTLS</application> into 
+    <application>Lynx</application>.</para>
+    
+    <para><command>chgrp -v -R root /usr/share/doc/lynx/2.8.5/lynx_doc</command>: 
+    This command corrects the improper group ownership of installed documentation 
+    files caused if <application>Lynx</application> is built by any user other
+    than <systemitem class="username">root</systemitem>.</para>
+    
+  </sect2>
+  
+  <sect2 role="configuration">
+    <title>Configuring Lynx</title>
 
-</sect2>
+    <sect3 id="lynx-config">
+      <title>Config Files</title>
+      
+      <para><filename>/etc/lynx.cfg</filename></para>
+      
+      <indexterm zone="lynx lynx-config">
+        <primary sortas="e-etc-lynx.cfg">/etc/lynx.cfg</primary>
+      </indexterm>
+    
+    </sect3>
+    
+    <sect3>
+      <title>Configuration Information</title>
+      
+      <para>Various settings such as proxies can be set in the system-wide
+      <filename>lynx.cfg</filename> file found in 
+      <filename class="directory">/etc</filename>.</para>
+    
+    </sect3>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-<sect2>
-<title>Command explanations</title>
+    <segmentedlist>
+    <segtitle>Installed Program</segtitle>
+    <segtitle>Installed Libraries</segtitle>
+    <segtitle>Installed Directory</segtitle>
+    
+    <seglistitem>
+      <seg>lynx</seg>
+      <seg>None</seg>
+      <seg>/usr/share/doc/lynx</seg>
+    </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="lynx-prog">
+        <term><command>lynx</command></term>
+        <listitem>
+          <para>is a general purpose, text-based, distributed information 
+          browser for the World Wide Web.</para>
+          <indexterm zone="lynx lynx-prog">
+            <primary sortas="b-lynx">lynx</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<para><parameter>--libdir=/etc</parameter>: For some reason, the
-<command>configure</command> and <command>make</command> routine for 
-<application>Lynx</application> uses libdir as the prefix for the
-configuration file. This is set to <filename class="directory">/etc</filename> 
-so that the system wide configuration file is 
-<filename>/etc/lynx.cfg</filename>.</para>
-
-<para><option>--with-zlib</option>: This enables support for
-linking <application>libz</application> into 
-<application>Lynx</application>.</para>
-
-<para><option>--with-bzlib</option>: This enables support for
-linking <application>libbz2</application> into 
-<application>Lynx</application>.</para>
-
-<para><parameter>docdir=... helpdir=...</parameter>: These
-variables are set to avoid getting the help and documentation files installed
-under <filename class="directory">/etc</filename>.</para>
-
-<para><option>--with-ssl</option>: This enables support for
-linking <acronym>SSL</acronym> into <application>Lynx</application>.</para>
-
-<para><option>--with-gnutls</option>: This enables support for
-linking <application>Gnu<acronym>TLS</acronym></application> into 
-<application>Lynx</application>.</para>
-
-<para><command>chgrp -v -R root /usr/share/doc/lynx/2.8.5/lynx_doc</command>: 
-This command corrects the improper group ownership of installed documentation 
-files caused if <application>Lynx</application> is built by any user other
-than root.</para>
-
-</sect2>
-
-<sect2>
-<title>Configuring <application>Lynx</application></title>
-
-<sect3 id="lynx-config"><title>Config files</title>
-<para><filename>/etc/lynx.cfg</filename></para>
-<indexterm zone="lynx lynx-config">
-<primary sortas="e-etc-lynx.cfg">/etc/lynx.cfg</primary></indexterm>
-</sect3>
-
-<sect3><title>Configuration Information</title>
-
-<para>Various settings such as proxies can be set in the system-wide
-<filename>lynx.cfg</filename> file found in 
-<filename class="directory">/etc</filename>.</para>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directory</segtitle>
-
-<seglistitem>
-<seg>lynx</seg>
-<seg>None</seg>
-<seg>/usr/share/doc/lynx</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="lynx-prog">
-<term><command>lynx</command></term>
-<listitem><para>is a general purpose, text-based, distributed information 
-browser for the World Wide Web.</para>
-<indexterm zone="lynx lynx-prog">
-<primary sortas="b-lynx">lynx</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>