Index: general/graphlib/libmng.xml
===================================================================
--- general/graphlib/libmng.xml	(revision 6b71f17aceead5ba4b72eba0a640a36d1eb7d94b)
+++ general/graphlib/libmng.xml	(revision 13d607923251c62db895f1dac2595701f0a9d113)
@@ -56,5 +56,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Libmng Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -102,5 +102,5 @@
       <segtitle>Installed Directory</segtitle>
 
-        <seglistitem>
+      <seglistitem>
         <seg>None</seg>
         <seg>libmng.[so,a]</seg>
Index: general/graphlib/libpng.xml
===================================================================
--- general/graphlib/libpng.xml	(revision 6b71f17aceead5ba4b72eba0a640a36d1eb7d94b)
+++ general/graphlib/libpng.xml	(revision 13d607923251c62db895f1dac2595701f0a9d113)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Libpng</title>
 
Index: general/graphlib/librsvg.xml
===================================================================
--- general/graphlib/librsvg.xml	(revision 6b71f17aceead5ba4b72eba0a640a36d1eb7d94b)
+++ general/graphlib/librsvg.xml	(revision 13d607923251c62db895f1dac2595701f0a9d113)
@@ -5,139 +5,156 @@
   %general-entities;
 
-<!ENTITY librsvg-download-http "http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.9/librsvg-&librsvg-version;.tar.bz2">
-<!ENTITY librsvg-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.9/librsvg-&librsvg-version;.tar.bz2">
-<!ENTITY librsvg-md5sum "44799d75e940eb4150acdae4f63cbe2a">
-<!ENTITY librsvg-size "392 KB">
-<!ENTITY librsvg-buildsize "9.8 MB">
-<!ENTITY librsvg-time "0.3 SBU">
+  <!ENTITY librsvg-download-http "http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.9/librsvg-&librsvg-version;.tar.bz2">
+  <!ENTITY librsvg-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.9/librsvg-&librsvg-version;.tar.bz2">
+  <!ENTITY librsvg-md5sum "44799d75e940eb4150acdae4f63cbe2a">
+  <!ENTITY librsvg-size "392 KB">
+  <!ENTITY librsvg-buildsize "9.8 MB">
+  <!ENTITY librsvg-time "0.3 SBU">
 ]>
 
 <sect1 id="librsvg" xreflabel="librsvg-&librsvg-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="librsvg.html"?>
-<title>librsvg-&librsvg-version;</title>
-<indexterm zone="librsvg">
-<primary sortas="a-Librsvg">Librsvg</primary></indexterm>
+  <?dbhtml filename="librsvg.html"?>
 
-<sect2>
-<title>Introduction to <application>librsvg</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>librsvg</application> package contains 
-<filename class="libraryfile">librsvg</filename> libraries and tools used to 
-manipulate, convert and view Scalable Vector Graphic 
-(<acronym>SVG</acronym>) images.</para>
+  <title>Librsvg-&librsvg-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&librsvg-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&librsvg-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &librsvg-md5sum;</para></listitem>
-<listitem><para>Download size: &librsvg-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&librsvg-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&librsvg-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="librsvg">
+    <primary sortas="a-Librsvg">Librsvg</primary>
+  </indexterm>
 
-<sect3><title><application>librsvg</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="gtk2"/>, 
-<xref linkend="libxml2"/>, 
-<xref linkend="libart_lgpl"/> and 
-<xref linkend="popt"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Librsvg</title>
 
-<sect4><title>Optional</title>
-<para><xref linkend="libcroco"/>, 
-<xref linkend="libgsf"/>, 
-<xref linkend="gnome-vfs"/>, 
-<xref linkend="libgnomeprintui"/>, 
-<xref linkend="mozilla"/>, 
-<xref linkend="gtk-doc"/> and 
-<xref linkend="docbook-utils"/></para>
-</sect4>
-</sect3>
+    <para>The <application>librsvg</application> package contains 
+    <filename class="libraryfile">librsvg</filename> libraries and tools used to 
+    manipulate, convert and view Scalable Vector Graphic (SVG) images.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&librsvg-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&librsvg-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &librsvg-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &librsvg-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &librsvg-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &librsvg-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>librsvg</application></title>
+    <bridgehead renderas="sect3">Librsvg Dependencies</bridgehead>
 
-<para>Install <application>librsvg</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="gtk2"/>, 
+    <xref linkend="libxml2"/>, 
+    <xref linkend="libart_lgpl"/> and 
+    <xref linkend="popt"/></para>
 
-<screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc \
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="libcroco"/>, 
+    <xref linkend="libgsf"/>, 
+    <xref linkend="gnome-vfs"/>, 
+    <xref linkend="libgnomeprintui"/>, 
+    <xref linkend="mozilla"/>, 
+    <xref linkend="gtk-doc"/> and 
+    <xref linkend="docbook-utils"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Librsvg</title>
+
+    <para>Install <application>librsvg</application> by running the following 
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc \
     --disable-gtk-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><option>--disable-gtk-doc</option>: This option prevents the rebuilding 
-of documentation during the <command>make</command> command.</para>
+    <para><parameter>--disable-gtk-doc</parameter>: This option prevents 
+    the rebuilding of documentation during the <command>make</command> 
+    command.</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>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<seglistitem>
-<seg>rsvg and rsvg-view</seg>
-<seg>librsvg-2.[so,a], <application>GTK+</application> modules and 
-<application>Mozilla</application> plugins</seg>
-<seg>/usr/include/librsvg-2 and /usr/share/gtk-doc/html/rsvg</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>rsvg and rsvg-view</seg>
+        <seg>librsvg-2.[so,a], <application>GTK+</application> modules and 
+        <application>Mozilla</application> plugins</seg>
+        <seg>/usr/include/librsvg-2 and /usr/share/gtk-doc/html/rsvg</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="rsvg">
-<term><command>rsvg</command></term>
-<listitem><para>is used to covert <acronym>SVG</acronym> images into 
-<acronym>PNG</acronym>, <acronym>JPEG</acronym> and 
-<acronym>ICO</acronym> raster images.</para>
-<indexterm zone="librsvg rsvg">
-<primary sortas="b-rsvg">rsvg</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="rsvg">
+        <term><command>rsvg</command></term>
+        <listitem>
+          <para>is used to covert SVG images into PNG, JPEG and 
+          ICO raster images.</para>
+          <indexterm zone="librsvg rsvg">
+            <primary sortas="b-rsvg">rsvg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="rsvg-view">
-<term><command>rsvg-view</command></term>
-<listitem><para>is used to view an <acronym>SVG</acronym> file in an 
-<application>X</application> window.</para>
-<indexterm zone="librsvg rsvg-view">
-<primary sortas="b-rsvg-view">rsvg-view</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="rsvg-view">
+        <term><command>rsvg-view</command></term>
+        <listitem>
+          <para>is used to view an SVG file in an <application>X</application> 
+          window.</para>
+          <indexterm zone="librsvg rsvg-view">
+            <primary sortas="b-rsvg-view">rsvg-view</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="librsvg-lib">
-<term><filename class='libraryfile'>librsvg-2.[so,a]</filename></term>
-<listitem><para> libraries provide the functions to render Scalable Vector 
-Graphics.</para>
-<indexterm zone="librsvg librsvg-lib">
-<primary sortas="c-librsvg">librsvg-2.[so,a]</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="librsvg-lib">
+        <term><filename class='libraryfile'>librsvg-2.[so,a]</filename></term>
+        <listitem>
+          <para> libraries provide the functions to render Scalable Vector 
+          Graphics.</para>
+          <indexterm zone="librsvg librsvg-lib">
+            <primary sortas="c-librsvg">librsvg-2.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
