Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml	(revision 36c3ba14a67bf7e985f973e273aa71590c6e5a29)
+++ x/installing/xorg.xml	(revision 7d7bb83d2d98e5ed721d64a31352c1b779869074)
@@ -87,5 +87,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Xorg Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision 36c3ba14a67bf7e985f973e273aa71590c6e5a29)
+++ x/lib/atk.xml	(revision 7d7bb83d2d98e5ed721d64a31352c1b779869074)
@@ -14,108 +14,116 @@
 
 <sect1 id="atk" xreflabel="ATK-&atk-version;">
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
-<?dbhtml filename="atk.html" ?>
-<title>ATK-&atk-version;</title>
+  <?dbhtml filename="atk.html" ?>
 
-<indexterm zone="atk">
-  <primary sortas="a-ATK">ATK</primary>
-</indexterm>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<sect2>
-<title>Introduction to <application><acronym>ATK</acronym></application></title>
+  <title>ATK-&atk-version;</title>
 
-<para>The <application><acronym>ATK</acronym></application> package contains the
-<application><acronym>ATK</acronym></application> libraries. They are useful for
-allowing accessibility solutions to be available for all
-<application><acronym>GTK</acronym>2</application>
-applications.</para>
+  <indexterm zone="atk">
+    <primary sortas="a-ATK">ATK</primary>
+  </indexterm>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&atk-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&atk-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &atk-md5sum;</para></listitem>
-<listitem><para>Download size: &atk-size;</para></listitem>
-<listitem><para>Estimated disk space required: &atk-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &atk-time;</para></listitem></itemizedlist>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to ATK</title>
 
-<sect3>
-  <title><application><acronym>ATK</acronym></application> dependencies</title>
+    <para>The <application>ATK</application> package contains the
+    <application>ATK</application> libraries. They are useful for
+    allowing accessibility solutions to be available for all
+    <application>GTK2</application> applications.</para>
 
-<sect4>
-<title>Required</title>
-<para><xref linkend="glib2"/></para>
-</sect4>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&atk-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&atk-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &atk-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &atk-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &atk-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &atk-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect4>
-<title>Optional</title>
-<para><xref linkend="gtk-doc"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect3">ATK Dependencies</bridgehead>
 
-</sect2>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="glib2"/></para>
 
-<sect2>
-<title>Installation of <application><acronym>ATK</acronym></application></title>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="gtk-doc"/></para>
 
-<para>Install <application><acronym>ATK</acronym></application> by running 
-the following commands:</para>
+  </sect2>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of ATK</title>
 
-<para>This package does not come with a test suite.</para>
+    <para>Install <application>ATK</application> by running
+    the following commands:</para>
 
-<para>Now, as the root user:</para>
- 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
 
-</sect2>
+    <para>This package does not come with a test suite.</para>
 
-<sect2>
-<title>Command explanations</title>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<para><option>--enable-gtk-doc</option>: This switch will rebuild
-the <acronym>API</acronym> documentation during the
-<command>make</command> command.</para>
+<screen role="root"><userinput>make install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
-  <segtitle>Installed Libraries</segtitle>
-  <segtitle>Installed Directories</segtitle>
- 
-  <seglistitem>
-    <seg>None</seg>
-    <seg>libatk-1.0.so</seg>
-    <seg>/usr/include/atk-1.0 and /usr/share/gtk-doc/html/atk</seg>
-  </seglistitem>
-</segmentedlist>
- 
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
+    <para><option>--enable-gtk-doc</option>: This switch will rebuild
+    the API documentation during the <command>make</command> command.</para>
 
-<varlistentry id="libatk">
-  <term><filename class='libraryfile'>atklib-1.0.so</filename></term>
-  <listitem>
-    <para>contains functions that are used by assistive technologies in order to
-          interact with the desktop and applications.</para>
-    <indexterm zone="atk libatk">
-      <primary sortas="c-libatk">libatk-1.0.so</primary>
-    </indexterm>
-  </listitem>
-</varlistentry>
-</variablelist> 
+  </sect2>
 
-</sect2>
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libatk-1.0.so</seg>
+        <seg>/usr/include/atk-1.0 and /usr/share/gtk-doc/html/atk</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libatk">
+        <term><filename class='libraryfile'>atklib-1.0.so</filename></term>
+        <listitem>
+          <para>contains functions that are used by assistive technologies
+          in order to interact with the desktop and applications.</para>
+          <indexterm zone="atk libatk">
+            <primary sortas="c-libatk">libatk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
