diff --git a/general/prog/ruby.xml b/general/prog/ruby.xml
index 855a9bb7a1..3ac75a4696 100644
--- a/general/prog/ruby.xml
+++ b/general/prog/ruby.xml
@@ -4,148 +4,173 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-<!ENTITY ruby-download-http " ">
-<!ENTITY ruby-download-ftp "ftp://ftp.ruby-lang.org/pub/ruby/ruby-&ruby-version;.tar.gz">
-<!ENTITY ruby-md5sum "8ffc79d96f336b80f2690a17601dea9b">
-<!ENTITY ruby-size "3.5 MB">
-<!ENTITY ruby-buildsize "55.2 MB">
-<!ENTITY ruby-time "0.93 SBU">
+  <!ENTITY ruby-download-http " ">
+  <!ENTITY ruby-download-ftp "ftp://ftp.ruby-lang.org/pub/ruby/ruby-&ruby-version;.tar.gz">
+  <!ENTITY ruby-md5sum "8ffc79d96f336b80f2690a17601dea9b">
+  <!ENTITY ruby-size "3.5 MB">
+  <!ENTITY ruby-buildsize "55.2 MB">
+  <!ENTITY ruby-time "0.93 SBU">
 ]>
 
 <sect1 id="ruby" xreflabel="Ruby-&ruby-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="ruby.html"?>
-<title>Ruby-&ruby-version;</title>
-<indexterm zone="ruby">
-<primary sortas="a-Ruby">Ruby</primary></indexterm>
+  <?dbhtml filename="ruby.html"?>
 
-<sect2>
-<title>Introduction to <application>Ruby</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>Ruby</application> package contains the
-<application>Ruby</application> development environment. This
-is useful for object-oriented scripting.</para>
+  <title>Ruby-&ruby-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&ruby-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&ruby-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &ruby-md5sum;</para></listitem>
-<listitem><para>Download size: &ruby-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&ruby-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&ruby-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="ruby">
+    <primary sortas="a-Ruby">Ruby</primary>
+  </indexterm>
 
-<sect3><title><application>Ruby</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="openssl"/>, 
-<xref linkend="tk"/>, 
-<xref linkend="db"/>, 
-<xref linkend="gdbm"/></para>
-</sect4>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to Ruby</title>
 
-</sect2>
+    <para>The <application>Ruby</application> package contains the
+    <application>Ruby</application> development environment. This
+    is useful for object-oriented scripting.</para>
 
-<sect2>
-<title>Installation of <application>Ruby</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&ruby-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&ruby-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &ruby-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &ruby-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &ruby-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &ruby-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>Ruby</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">Ruby Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=/usr --enable-shared \
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="openssl"/>, 
+    <xref linkend="tk"/>, 
+    <xref linkend="db"/>, 
+    <xref linkend="gdbm"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Ruby</title>
+
+    <para>Install <application>Ruby</application> by running the following 
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --enable-shared \
 --enable-pthread --enable-install-doc &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+<screen role="root"><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><parameter>--enable-shared</parameter>: This parameter builds the 
-<filename class='libraryfile'>libruby</filename> shared library.</para>
+    <para><parameter>--enable-shared</parameter>: This parameter builds the 
+    <filename class='libraryfile'>libruby</filename> shared library.</para>
 
-<para><parameter>--enable-pthread</parameter>: This parameter links the 
-threading library into the <application>Ruby</application> build.</para>
+    <para><parameter>--enable-pthread</parameter>: This parameter links the 
+    threading library into the <application>Ruby</application> build.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<seglistitem>
-<seg>ruby, irb, erb, rdoc, ri and testrb</seg>
-<seg>libruby.so and numerous modules located in the 
-<filename class='directory'>/usr/lib/ruby</filename> hierarchy.</seg>
-<seg>/usr/lib/ruby and /usr/share/ri</seg></seglistitem>
-</segmentedlist>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+      <seglistitem>
+        <seg>ruby, irb, erb, rdoc, ri, and testrb</seg>
+        <seg>libruby.so and numerous modules located in the 
+        <filename class='directory'>/usr/lib/ruby</filename> hierarchy.</seg>
+        <seg>/usr/lib/ruby and /usr/share/ri</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<varlistentry id="ruby-prog">
-<term><command>ruby</command></term>
-<listitem><para>is an interpreted scripting language for quick
-and easy object-oriented programming.</para>
-<indexterm zone="ruby ruby-prog">
-<primary sortas="b-ruby">ruby</primary></indexterm>
-</listitem>
-</varlistentry>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="irb">
-<term><command>irb</command></term>
-<listitem><para>is the interactive interface for
-<application>Ruby</application>.</para>
-<indexterm zone="ruby irb">
-<primary sortas="b-irb">irb</primary></indexterm>
-</listitem>
-</varlistentry>
+      <varlistentry id="ruby-prog">
+        <term><command>ruby</command></term>
+        <listitem>
+          <para>is an interpreted scripting language for quick
+          and easy object-oriented programming.</para>
+          <indexterm zone="ruby ruby-prog">
+            <primary sortas="b-ruby">ruby</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="erb">
-<term><command>erb</command></term>
-<listitem><para>is Tiny eRuby. It interprets a
-<application>Ruby</application> code embedded text file.</para>
-<indexterm zone="ruby erb">
-<primary sortas="b-erb">erb</primary></indexterm>
-</listitem>
-</varlistentry>
+      <varlistentry id="irb">
+        <term><command>irb</command></term>
+        <listitem>
+          <para>is the interactive interface for
+          <application>Ruby</application>.</para>
+          <indexterm zone="ruby irb">
+            <primary sortas="b-irb">irb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="ri">
-<term><command>ri</command></term>
-<listitem><para>displays documentation from a database on
-<application>Ruby</application> classes, modules and methods.</para>
-<indexterm zone="ruby ri">
-<primary sortas="b-ri">ri</primary></indexterm>
-</listitem>
-</varlistentry>
+      <varlistentry id="erb">
+        <term><command>erb</command></term>
+        <listitem>
+          <para>is Tiny eRuby. It interprets a
+          <application>Ruby</application> code embedded text file.</para>
+          <indexterm zone="ruby erb">
+            <primary sortas="b-erb">erb</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="libruby">
-<term><filename role="library">libruby.so</filename></term>
-<listitem><para>contains the <acronym>API</acronym> functions required
-by <application>Ruby</application>.</para>
-<indexterm zone="ruby libruby">
-<primary sortas="c-libruby">libruby.so</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="ri">
+        <term><command>ri</command></term>
+        <listitem>
+          <para>displays documentation from a database on
+          <application>Ruby</application> classes, modules and methods.</para>
+          <indexterm zone="ruby ri">
+            <primary sortas="b-ri">ri</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+      <varlistentry id="libruby">
+        <term><filename role="library">libruby.so</filename></term>
+        <listitem>
+          <para>contains the <acronym>API</acronym> functions required
+          by <application>Ruby</application>.</para>
+          <indexterm zone="ruby libruby">
+            <primary sortas="c-libruby">libruby.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>