Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision 85965ede6a64baf8e68f6c81b3f218a7d3fb12bc)
+++ general/graphlib/freetype2.xml	(revision 09da1979fd10cad5d489c848a41d7066b6e9c87b)
@@ -5,109 +5,129 @@
   %general-entities;
 
-<!ENTITY freetype2-download-http "http://prdownloads.sourceforge.net/freetype/freetype-&freetype2-version;.tar.bz2">
-<!ENTITY freetype2-download-ftp " ">
-<!ENTITY freetype2-md5sum "ec1b903e4be5f073caa72458ea58c29c">
-<!ENTITY freetype2-size "970 KB">
-<!ENTITY freetype2-buildsize "20.1 MB">
-<!ENTITY freetype2-time "0.29 SBU">
+  <!ENTITY freetype2-download-http "http://prdownloads.sourceforge.net/freetype/freetype-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-download-ftp " ">
+  <!ENTITY freetype2-md5sum "ec1b903e4be5f073caa72458ea58c29c">
+  <!ENTITY freetype2-size "970 KB">
+  <!ENTITY freetype2-buildsize "20.1 MB">
+  <!ENTITY freetype2-time "0.29 SBU">
 ]>
 
 <sect1 id="freetype2" xreflabel="FreeType-&freetype2-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="freetype2.html"?>
-<title>FreeType-&freetype2-version;</title>
-<indexterm zone="freetype2">
-<primary sortas="a-FreeType">FreeType</primary></indexterm>
+  <?dbhtml filename="freetype2.html"?>
 
-<sect2>
-<title>Introduction to <application>FreeType2</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>FreeType2</application> package contains a library to 
-allow applications to properly render 
-<application>TrueType</application> fonts.</para>
+  <title>FreeType-&freetype2-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&freetype2-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&freetype2-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &freetype2-md5sum;</para></listitem>
-<listitem><para>Download size: &freetype2-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&freetype2-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&freetype2-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="freetype2">
+    <primary sortas="a-FreeType">FreeType</primary>
+  </indexterm>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Recommended patch: <ulink 
-url="&patch-root;/freetype-&freetype2-version;-bytecode_interpreter-1.patch"/>
-</para></listitem>
-</itemizedlist></sect3>
+  <sect2 role="package">
+    <title>Introduction to FreeType2</title>
 
-</sect2>
+  <para>The <application>FreeType2</application> package 
+  contains a library to allow applications to properly render
+  <application>TrueType</application> fonts.</para>
 
-<sect2>
-<title>Installation of <application>FreeType2</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&freetype2-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&freetype2-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &freetype2-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &freetype2-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &freetype2-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &freetype2-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>FreeType2</application> by running the following
-commands:</para>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Recommended patch: <ulink 
+        url="&patch-root;/freetype-&freetype2-version;-bytecode_interpreter-1.patch"/>
+      </para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>patch -Np1 -i ../freetype-&freetype2-version;-bytecode_interpreter-1.patch &amp;&amp;
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of FreeType2</title>
+
+    <para>Install <application>FreeType2</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../freetype-&freetype2-version;-bytecode_interpreter-1.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<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>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-<segtitle>Installed Program</segtitle>
-<segtitle>Installed Library</segtitle>
-<segtitle>Installed Directory</segtitle>
+    <segmentedlist>
+    <segtitle>Installed Program</segtitle>
+    <segtitle>Installed Library</segtitle>
+    <segtitle>Installed Directory</segtitle>
 
-<seglistitem>
-<seg>freetype-config</seg>
-<seg>libfreetype.[so,a]</seg>
-<seg>/usr/include/freetype2</seg>
-</seglistitem>
-</segmentedlist>
+    <seglistitem>
+      <seg>freetype-config</seg>
+      <seg>libfreetype.[so,a]</seg>
+      <seg>/usr/include/freetype2</seg>
+    </seglistitem>
+    </segmentedlist>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="freetype-config">
-<term><command>freetype-config</command></term>
-<listitem><para>is used to get <application>FreeType</application> compilation 
-and linking information.</para>
-<indexterm zone="freetype2 freetype-config">
-<primary sortas="b-freetype-config">freetype-config</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="freetype-config">
+        <term><command>freetype-config</command></term>
+        <listitem>
+          <para>is used to get <application>FreeType</application> compilation 
+          and linking information.</para>
+          <indexterm zone="freetype2 freetype-config">
+            <primary sortas="b-freetype-config">freetype-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="libfreetype">
-<term><filename class='libraryfile'>libfreetype.[so,a]</filename></term>
-<listitem><para>contains functions to add <application>TrueType</application> 
-font capabilities to the X Window system.</para>
-<indexterm zone="freetype2 libfreetype">
-<primary sortas="c-libfreetype">libfreetype.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="libfreetype">
+        <term><filename class='libraryfile'>libfreetype.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions to add <application>TrueType</application> 
+          font capabilities to the X Window system.</para>
+          <indexterm zone="freetype2 libfreetype">
+            <primary sortas="c-libfreetype">libfreetype.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
