Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 68ceed75999e91bcc64535b8148788c6818662e2)
+++ general/graphlib/libpng.xml	(revision 6b71f17aceead5ba4b72eba0a640a36d1eb7d94b)
@@ -5,148 +5,169 @@
   %general-entities;
 
-<!ENTITY libpng-download-http "http://prdownloads.sourceforge.net/libpng/libpng-&libpng-version;.tar.bz2">
-<!ENTITY libpng-download-ftp " ">
-<!ENTITY libpng-md5 "00cea4539bea4bd34cbf8b82ff9589cd">
-<!ENTITY libpng-size "376 KB">
-<!ENTITY libpng-buildsize "5.75 MB">
-<!ENTITY libpng-time "0.13 SBU">
+  <!ENTITY libpng-download-http "http://prdownloads.sourceforge.net/libpng/libpng-&libpng-version;.tar.bz2">
+  <!ENTITY libpng-download-ftp " ">
+  <!ENTITY libpng-md5sum "00cea4539bea4bd34cbf8b82ff9589cd">
+  <!ENTITY libpng-size "376 KB">
+  <!ENTITY libpng-buildsize "5.75 MB">
+  <!ENTITY libpng-time "0.13 SBU">
 ]>
 
 <sect1 id="libpng" xreflabel="libpng-&libpng-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libpng.html"?>
-<title>libpng-&libpng-version;</title>
-<indexterm zone="libpng">
-<primary sortas="a-Libpng">Libpng</primary></indexterm>
+  <?dbhtml filename="libpng.html"?>
 
-<sect2>
-<title>Introduction to <application>libpng</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>libpng</application> package contains libraries used
-by other programs for reading and writing <acronym>PNG</acronym> files.</para>
+  <title>Libpng-&libpng-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libpng-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libpng-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 Sum: &libpng-md5;</para></listitem>
-<listitem><para>Download size: &libpng-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&libpng-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libpng-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libpng">
+    <primary sortas="a-Libpng">Libpng</primary>
+  </indexterm>
 
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch to explicitly link 
-<application>libpng</application> against system libraries: <ulink 
-url="&patch-root;/libpng-&libpng-version;-link_to_proper_libs-1.patch"/></para>
-</listitem>
-</itemizedlist></sect3>
+  <sect2>
+    <title>Introduction to Libpng</title>
 
-</sect2>
+    <para>The <application>libpng</application> package contains libraries used
+    by other programs for reading and writing PNG files.</para>
 
-<sect2>
-<title>Installation of <application>libpng</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libpng-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libpng-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libpng-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libpng-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libpng-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libpng-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>libpng</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch to explicitly link 
+        <application>libpng</application> against system libraries: <ulink 
+        url="&patch-root;/libpng-&libpng-version;-link_to_proper_libs-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>patch -Np1 -i ../libpng-&libpng-version;-link_to_proper_libs-1.patch &amp;&amp;
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Libpng</title>
+
+    <para>Install <application>libpng</application> by running the following 
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../libpng-&libpng-version;-link_to_proper_libs-1.patch &amp;&amp;
 make prefix=/usr ZLIBINC=/usr/include \
-    ZLIBLIB=/usr/lib -f scripts/makefile.linux</command></userinput></screen>
+    ZLIBLIB=/usr/lib -f scripts/makefile.linux</userinput></screen>
 
-<para>To test the results, issue: <command>make -f scripts/makefile.linux test</command>.</para>
+    <para>To test the results, issue: <command>make -f scripts/makefile.linux test</command>.</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 prefix=/usr install -f scripts/makefile.linux</command></userinput></screen>
+<screen role="root"><userinput>make prefix=/usr install -f scripts/makefile.linux</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><parameter>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</parameter>: This
-forces <application>libpng</application> to look for the
-<application>zlib</application> includes and libraries where they are 
-installed.</para>
+    <para><parameter>ZLIBINC=/usr/include ZLIBLIB=/usr/lib</parameter>: This
+    forces <application>libpng</application> to look for the
+    <application>zlib</application> includes and libraries where they are 
+    installed.</para>
 
-<para><parameter>-f scripts/makefile.linux</parameter>: This points 
-<command>make</command> at the <application>Linux</application> version of the 
-<filename>Makefile</filename> as <application>libpng</application> doesn't use 
-an <application>autoconf</application> routine. Instead, it has various 
-<filename>Makefile</filename>s for different platforms.</para>
+    <para><parameter>-f scripts/makefile.linux</parameter>: This points 
+    <command>make</command> at the <application>Linux</application> version of the 
+    <filename>Makefile</filename> as <application>libpng</application> doesn't use 
+    an <application>autoconf</application> routine. Instead, it has various 
+    <filename>Makefile</filename>s for different platforms.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Configuring <application>libpng</application></title>
+  <sect2 role="configuration">
+    <title>Configuring Libpng</title>
 
-<sect3><title>Configuration Information</title>
+    <sect3>
+      <title>Configuration Information</title>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>
+      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../../lib-config.xml"/>
 
-</sect3>
+    </sect3>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directory</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
-<seglistitem>
-<seg>libpng-config and libpng12-config</seg>
-<seg>libpng.[so,a] and libpng12.[so,a]</seg>
-<seg>/usr/include/libpng12</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>libpng-config and libpng12-config</seg>
+        <seg>libpng.[so,a] and libpng12.[so,a]</seg>
+        <seg>/usr/include/libpng12</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="libpng-config">
-<term><command>libpng-config</command></term>
-<listitem><para>is a symlink to <command>libpng12-config</command>.</para>
-<indexterm zone="libpng libpng-config">
-<primary sortas="g-libpng-config">libpng-config</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="libpng-config">
+        <term><command>libpng-config</command></term>
+        <listitem>
+          <para>is a symlink to <command>libpng12-config</command>.</para>
+          <indexterm zone="libpng libpng-config">
+            <primary sortas="g-libpng-config">libpng-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="libpng12-config">
-<term><command>libpng12-config</command></term>
-<listitem><para>provides configuration information for 
-<application>libpng</application>.</para>
-<indexterm zone="libpng libpng12-config">
-<primary sortas="b-libpng12-config">libpng12-config</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="libpng12-config">
+        <term><command>libpng12-config</command></term>
+        <listitem>
+          <para>provides configuration information for
+          <application>libpng</application>.</para>
+          <indexterm zone="libpng libpng12-config">
+            <primary sortas="b-libpng12-config">libpng12-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="libpng12">
-<term><filename class='libraryfile'>libpng.[so,a] and 
-libpng12.[so,a]</filename></term>
-<listitem><para>libraries are a collection of routines used to create and 
-manipulate <acronym>PNG</acronym> format graphics files. The
-<acronym>PNG</acronym> format was designed as a replacement for 
-<acronym>GIF</acronym> and, to a lesser extent, <acronym>TIFF</acronym>, with 
-many improvements and extensions and lack of patent problems.</para>
-<indexterm zone="libpng libpng12">
-<primary sortas="c-libpng">libpng.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="libpng12">
+        <term><filename class='libraryfile'>libpng.[so,a] and 
+        libpng12.[so,a]</filename></term>
+        <listitem>
+          <para>are a collection of routines used to create and manipulate PNG 
+          format graphics files. The PNG format was designed as a replacement for 
+          GIF and, to a lesser extent, TIFF, with many improvements and extensions 
+          and lack of patent problems.</para>
+          <indexterm zone="libpng libpng12">
+            <primary sortas="c-libpng">libpng.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
