Index: general/genlib/expat.xml
===================================================================
--- general/genlib/expat.xml	(revision ea97e13f37e881ee6d93ffa04e96abca26586c15)
+++ general/genlib/expat.xml	(revision 3a0d3cf8c4c24658157000110971448d48d6043a)
@@ -10,5 +10,5 @@
 <!ENTITY expat-size "314 KB">
 <!ENTITY expat-buildsize "4.2 MB">
-<!ENTITY expat-time "0.11 SBU">
+<!ENTITY expat-time "0.08 SBU">
 ]>
 
@@ -20,4 +20,6 @@
 <?dbhtml filename="expat.html"?>
 <title>expat-&expat-version;</title>
+<indexterm zone="expat">
+<primary sortas="a-Expat">Expat</primary></indexterm>
 
 <sect2>
@@ -56,6 +58,9 @@
 
 <screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -64,15 +69,38 @@
 <title>Contents</title>
 
-<para>The <application>expat</application> package contains the 
-<filename>libexpat</filename> libraries and
-<command>xmlwf</command>.</para>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directories</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>xmlwf</seg>
+<seg>libexpat.[so,a]</seg>
+<seg>None</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>xmlwf</title>
-<para><command>xmlwf</command> is a non-validating utility to check whether or
-not <acronym>XML</acronym> documents are well formed.</para></sect3>
+<varlistentry id="xmlwf">
+<term><command>xmlwf</command></term>
+<listitem><para>is a non-validating utility to check whether or not 
+<acronym>XML</acronym> documents are well formed.</para>
+<indexterm zone="expat xmlwf">
+<primary sortas="b-xmlwf">xmlwf</primary>
+</indexterm></listitem>
+</varlistentry>
+
+<varlistentry id="libexpat">
+<term><filename class='libraryfile'>libexpat.[so,a]</filename></term>
+<listitem><para>contains <acronym>API</acronym> functions for parsing 
+<acronym>XML</acronym>.</para>
+<indexterm zone="expat libexpat">
+<primary sortas="c-libexpat">libexpat.[so,a]</primary>
+</indexterm></listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision ea97e13f37e881ee6d93ffa04e96abca26586c15)
+++ general/graphlib/freetype2.xml	(revision 3a0d3cf8c4c24658157000110971448d48d6043a)
@@ -9,6 +9,6 @@
 <!ENTITY freetype2-md5sum "ec1b903e4be5f073caa72458ea58c29c">
 <!ENTITY freetype2-size "970 KB">
-<!ENTITY freetype2-buildsize "18 MB">
-<!ENTITY freetype2-time "0.32 SBU">
+<!ENTITY freetype2-buildsize "20.1 MB">
+<!ENTITY freetype2-time "0.29 SBU">
 ]>
 
@@ -20,9 +20,11 @@
 <?dbhtml filename="freetype2.html"?>
 <title>FreeType-&freetype2-version;</title>
+<indexterm zone="freetype2">
+<primary sortas="a-FreeType">FreeType</primary></indexterm>
 
 <sect2>
 <title>Introduction to <application>FreeType2</application></title>
 
-<para>The <application>FreeType2</application> package contains a library to
+<para>The <application>FreeType2</application> package contains a library to 
 allow applications to properly render 
 <application>TrueType</application> fonts.</para>
@@ -44,5 +46,5 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Recommended Patch: <ulink
+<listitem><para>Recommended patch: <ulink 
 url="&patch-root;/freetype-&freetype2-version;-bytecode_interpreter-1.patch"/>
 </para></listitem>
@@ -59,6 +61,9 @@
 <screen><userinput><command>patch -Np1 -i ../freetype-&freetype2-version;-bytecode_interpreter-1.patch &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
+make</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make install</command></userinput></screen>
 
 </sect2>
@@ -67,14 +72,38 @@
 <title>Contents</title>
 
-<para>The <application>FreeType2</application> package contains 
-<filename class="libraryfile">libfreetype</filename> libraries.</para>
-</sect2>
+<segmentedlist>
+<segtitle>Installed Program</segtitle>
+<segtitle>Installed Library</segtitle>
+<segtitle>Installed Directory</segtitle>
 
-<sect2><title>Description</title>
+<seglistitem>
+<seg>freetype-config</seg>
+<seg>libfreetype.[so,a]</seg>
+<seg>/usr/include/freetype2</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect3><title>FreeType2 libraries</title>
-<para><application>FreeType2</application> libraries add
-<application>TrueType</application> font capabilities to 
-<application>XFree86</application>.</para></sect3>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+
+<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>
 
 </sect2>
