diff --git a/general/genlib/slib.xml b/general/genlib/slib.xml
index 942b3df78a..418644f12d 100644
--- a/general/genlib/slib.xml
+++ b/general/genlib/slib.xml
@@ -4,128 +4,143 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY slib-download-http "http://swiss.csail.mit.edu/ftpdir/scm/slib&slib-version;.tar.gz">
-<!ENTITY slib-download-ftp  " ">
-<!ENTITY slib-md5sum        "dc1aa0ffb9e2414223ceefc315f6baf9">
-<!ENTITY slib-size          "705 KB">
-<!ENTITY slib-buildsize     "8.6 MB">
-<!ENTITY slib-time          "0.01 SBU">
+  <!ENTITY slib-download-http "http://swiss.csail.mit.edu/ftpdir/scm/slib&slib-version;.tar.gz">
+  <!ENTITY slib-download-ftp  " ">
+  <!ENTITY slib-md5sum        "dc1aa0ffb9e2414223ceefc315f6baf9">
+  <!ENTITY slib-size          "705 KB">
+  <!ENTITY slib-buildsize     "8.6 MB">
+  <!ENTITY slib-time          "0.01 SBU">
 ]>
 
 <sect1 id="slib" xreflabel="SLIB-&slib-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="slib.html"?>
-<title>SLIB-&slib-version;</title>
-<indexterm zone="slib">
-<primary sortas="a-SLIB">SLIB</primary></indexterm>
+  <?dbhtml filename="slib.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>SLIB-&slib-version;</title>
+  
+  <indexterm zone="slib">
+    <primary sortas="a-SLIB">SLIB</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to <application>SLIB</application></title>
+  <sect2 role="package">
+    <title>Introduction to SLIB</title>
+    
+    <para>The <application>SLIB</application> package is a portable library for 
+    the programming language <application>Scheme</application>. It provides a 
+    platform independent framework for using <quote>packages</quote> of 
+    <application>Scheme</application> procedures and syntax. 
+    <application>SLIB</application> contains useful packages for all 
+    <application>Scheme</application> implementations, including 
+    <application>Guile</application>. Its catalog can be transparently extended 
+    to accomodate packages specific to a site, implementation, user or 
+    directory.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&slib-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&slib-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &slib-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &slib-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &slib-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &slib-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink
+        url="&patch-root;/slib-&slib-version;-automate_install-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">SLIB Dependencies</bridgehead>
+    
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="guile"/></para>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of SLIB</title>
 
-<para>The <application>SLIB</application> package is a portable library for 
-the programming language <application>Scheme</application>. It provides a 
-platform independent framework for using <quote>packages</quote> of 
-<application>Scheme</application> procedures and syntax. 
-<application>SLIB</application> contains useful packages for all 
-<application>Scheme</application> implementations, including 
-<application>Guile</application>. Its catalog can be transparently extended 
-to accomodate packages specific to a site, implementation, user or 
-directory.</para>
+    <para>Install <application>SLIB</application> by issuing the following 
+    commands:</para>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&slib-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&slib-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &slib-md5sum;</para></listitem>
-<listitem><para>Download size: &slib-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&slib-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&slib-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
-url="&patch-root;/slib-&slib-version;-automate_install-1.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>SLIB</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="guile"/></para>
-</sect4>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>SLIB</application></title>
-
-<para>Install <application>SLIB</application> by issuing the following 
-commands:</para>
-
-<screen><userinput><command>patch -Np1 -i ../slib-&slib-version;-automate_install-1.patch &amp;&amp;
-make</command></userinput></screen>
-
-<para>Now, as the root user:</para>
-
-<screen><userinput role='root'><command>make prefix=/usr/ install &amp;&amp;
+<screen><userinput>patch -Np1 -i ../slib-&slib-version;-automate_install-1.patch &amp;&amp;
+make</userinput></screen>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make prefix=/usr/ install &amp;&amp;
 make prefix=/usr/ catalogs &amp;&amp;
-make prefix=/usr/ installinfo</command></userinput></screen>
+make prefix=/usr/ installinfo</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-</sect2>
+    <para><command>make prefix=/usr/ catalogs</command>: This command builds the 
+    <application>SLIB</application> <application>Scheme</application> 
+    implementation catalog.</para>
+    
+    <para><command>make prefix=/usr/ installinfo</command>: This commands installs 
+    the <command>info</command> documentation.</para>
+    
+  </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>slib</seg>
+        <seg>a <application>Scheme</application> library system.</seg>
+        <seg>/usr/share/guile/slib</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="slib-prog">
+        <term><command>slib</command></term>
+        <listitem>
+          <para>is a shell script used to initialize 
+          <application>SLIB</application> in a named <application>Scheme</application> 
+          implementation. It can also be used to initialize an 
+          <application>SLIB</application> session using a given executable.</para>
+          <indexterm zone="slib slib-prog">
+            <primary sortas="b-slib">slib</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<para><command>make prefix=/usr/ catalogs</command>: This command builds the 
-<application>SLIB</application> <application>Scheme</application> 
-implementation catalog.</para>
-
-<para><command>make prefix=/usr/ installinfo</command>: This commands installs 
-the <command>info</command> documentation.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directory</segtitle>
-
-<seglistitem>
-<seg>slib</seg>
-<seg>The <application>SLIB</application> package contains a 
-<application>Scheme</application> library system.</seg>
-<seg>/usr/share/guile/slib</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="slib-prog">
-<term><command>slib</command></term>
-<listitem><para>is a shell script used to initialize 
-<application>SLIB</application> in a named <application>Scheme</application> 
-implementation. It can also be used to initialize an 
-<application>SLIB</application> session using a given executable.</para>
-<indexterm zone="slib slib-prog">
-<primary sortas="b-slib">slib</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
  
 </sect1>