Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision bd839f8022c975510cc43a7ca43b4a3603984439)
+++ x/lib/gtk+2.xml	(revision a9f41dd7dbf498b6835bf177774aadb6c47a96f4)
@@ -15,9 +15,14 @@
 <sect1 id="gtk2" xreflabel="GTK+-&gtk2-version;">
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="gtk2.html" ?>
 <title>GTK+-&gtk2-version;</title>
+
+<indexterm zone="gtk2">
+  <primary sortas="a-gtk2">gtk2</primary>
+</indexterm>
 
 <sect2>
@@ -30,26 +35,33 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink url="&gtk2-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink url="&gtk2-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &gtk2-md5sum;</para></listitem>
-<listitem><para>Download size: &gtk2-size;</para></listitem>
-<listitem><para>Estimated disk space required: &gtk2-buildsize;</para></listitem>
-<listitem><para>Estimated build time: &gtk2-time;</para></listitem></itemizedlist>
+  <listitem><para>Download (HTTP): <ulink url="&gtk2-download-http;"/></para></listitem>
+  <listitem><para>Download (FTP): <ulink url="&gtk2-download-ftp;"/></para></listitem>
+  <listitem><para>Download MD5 sum: &gtk2-md5sum;</para></listitem>
+  <listitem><para>Download size: &gtk2-size;</para></listitem>
+  <listitem><para>Estimated disk space required: &gtk2-buildsize;</para></listitem>
+  <listitem><para>Estimated build time: &gtk2-time;</para></listitem>
+</itemizedlist>
 </sect3>
 
-<sect3><title><application><acronym>GTK</acronym>+</application> dependencies</title>
-<sect4><title>Required</title>
-<para>
-X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
-<xref linkend="pango"/> and
-<xref linkend="atk"/>
-</para></sect4>
-<sect4><title>Optional</title>
-<para>
-<xref linkend="libtiff"/>,
-<xref linkend="libjpeg"/>,
-<xref linkend="gtk-doc"/> and
-<xref linkend="docbook-utils"/>
-</para></sect4>
+<sect3>
+  <title><application><acronym>GTK</acronym>+</application> dependencies</title>
+ <sect4>
+   <title>Required</title>
+   <para>
+     X (<xref linkend="xorg"/> or <xref linkend="xfree86"/>),
+     <xref linkend="pango"/>, and
+     <xref linkend="atk"/>
+   </para>
+  </sect4>
+
+  <sect4>
+    <title>Optional</title>
+    <para>
+      <xref linkend="libtiff"/>,
+      <xref linkend="libjpeg"/>,
+      <xref linkend="gtk-doc"/>, and
+      <xref linkend="docbook-utils"/>
+    </para>
+  </sect4>
 </sect3>
 
@@ -64,6 +76,9 @@
 <screen><userinput><command>./configure --prefix=/usr --sysconfdir=/etc \
     --without-libtiff --without-libjpeg &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>
@@ -90,45 +105,73 @@
 <title>Contents</title>
 
-<para>The <application><acronym>GTK</acronym>+</application> package contains
-<command>gdk-pixbuf-csource</command>,
-<command>gdk-pixbuf-query-loaders</command>,
-<command>gtk-demo</command>,
-<command>gtk-query-immodules-2.0</command>,
-<command>gtk-update-icon-cache</command>,
-<filename class="libraryfile">libgdk_pixbuf-2.0</filename>,
-<filename class="libraryfile">libgdk-x11-2.0</filename>,
-<filename class="libraryfile">libgtk-x11-2.0</filename> and
-<filename class="libraryfile">libgdk_pixbuf_xlib-2.0</filename>
-libraries.</para>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+  <segtitle>Installed Libraries</segtitle>
+  <segtitle>Installed Directories</segtitle>
+ 
+  <seglistitem>
+    <seg>gdk-pixbuf-csource, gdk-pixbuf-query-loaders, gtk-demo, gtk-query-immodules-2.0, 
+         gtk-update-icon-cache</seg>
+    <seg>libgdk_pixbuf-2.0, libgdk-x11-2.0, libgtk-x11-2.0, libgdk_pixbuf_xlib-2.0</seg>
+    <seg>None</seg>
+  </seglistitem>
+</segmentedlist>
+ 
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
 
-</sect2>
+<varlistentry id="gdk-pixbuf-csource">
+  <term><command>gdk-pixbuf-csource</command></term>
+  <listitem>
+    <para>generates C code containing images, useful for compiling images directly into programs.</para>
+    <indexterm zone="gtk2 gdk-pixbuf-csource">
+      <primary sortas="b-gdk-pixbuf-csource">gdk-pixbuf-csource</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect2><title>Description</title>
+<varlistentry id="gdk-pixbuf-query-loaders">
+  <term><command>gdk-pixbuf-query-loaders</command></term>
+  <listitem>
+    <para>collects information about loadable modules for gdk-pixbuf and writes it to standard output.</para>
+    <indexterm zone="gtk2 gdk-pixbuf-query-loaders">
+      <primary sortas="b-gdk-pixbuf-query-loaders">gdk-pixbuf-query-loaders</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>gdk-pixbuf-csource</title>
-<para><command>gdk-pixbuf-csource</command> generates C code containing
-images, useful for compiling images directly into
-programs.</para></sect3>
+<varlistentry id="gtk-query-immodules-2.0">
+  <term><command>gtk-query-immodules-2.0</command></term>
+  <listitem>
+    <para> collects information about loadable input method modules for 
+           <application><acronym>GTK</acronym>+</application> and writes it to standard output.</para>
+    <indexterm zone="gtk2 gtk-query-immodules-2.0">
+      <primary sortas="b-gtk-query-immodules-2.0">gtk-query-immodules-2.0</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>gdk-pixbuf-query-loaders</title>
-<para><command>gdk-pixbuf-query-loaders</command> collects information
-about loadable modules for gdk-pixbuf and writes it to standard
-output.</para></sect3>
+<varlistentry id="gtk-update-icon-cache">
+  <term><command>gtk-update-icon-cache</command></term>
+  <listitem>
+    <para>creates mmap()able cache files for icon themes.</para>
+    <indexterm zone="gtk2 gtk-update-icon-cache">
+      <primary sortas="b-gtk-update-icon-cache">gtk-update-icon-cache</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>gtk-query-immodules-2.0</title>
-<para><command>gtk-query-immodules-2.0</command> collects information
-about loadable input method modules for
-<application><acronym>GTK</acronym>+</application> and writes it to
-standard output.</para></sect3>
+<varlistentry id="GTK2libs">
+  <term>GTK+ Libraries</term>
+  <listitem>
+    <para>provide the API to implement graphical user interfaces.</para>
+    <indexterm zone="gtk2 GTK2libs">
+      <primary sortas="c-GTK2libs">GTK+ Libraries</primary>
+    </indexterm>
+  </listitem>
+</varlistentry>
 
-<sect3><title>gtk-update-icon-cache</title>
-<para><command>gtk-update-icon-cache</command> creates mmap()able cache
-files for icon themes.</para></sect3>
-
-<sect3><title><application><acronym>GTK</acronym>+</application> Libraries</title>
-<para><application><acronym>GTK</acronym>+</application> Libraries provide the 
-<acronym>API</acronym> to implement graphical user
-interfaces.</para></sect3>
-
+</variablelist> 
 </sect2>
 
Index: x/lib/hicolor-icon-theme.xml
===================================================================
--- x/lib/hicolor-icon-theme.xml	(revision bd839f8022c975510cc43a7ca43b4a3603984439)
+++ x/lib/hicolor-icon-theme.xml	(revision a9f41dd7dbf498b6835bf177774aadb6c47a96f4)
@@ -16,9 +16,14 @@
 xreflabel="hicolor-icon-theme-&hicolor-icon-theme-version;">
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
+
 <?dbhtml filename="hicolor-icon-theme.html" ?>
 <title>hicolor-icon-theme-&hicolor-icon-theme-version;</title>
+
+<indexterm zone="hicolor-icon-theme">
+  <primary sortas="a-hicolor-icon-theme">hicolor-icon-theme</primary>
+</indexterm>
 
 <sect2>
@@ -31,16 +36,11 @@
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&hicolor-icon-theme-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&hicolor-icon-theme-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: 
-&hicolor-icon-theme-md5sum;</para></listitem>
-<listitem><para>Download size: 
-&hicolor-icon-theme-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&hicolor-icon-theme-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&hicolor-icon-theme-time;</para></listitem></itemizedlist>
+  <listitem><para>Download (HTTP): <ulink url="&hicolor-icon-theme-download-http;"/></para></listitem>
+  <listitem><para>Download (FTP): <ulink url="&hicolor-icon-theme-download-ftp;"/></para></listitem>
+  <listitem><para>Download MD5 sum: &hicolor-icon-theme-md5sum;</para></listitem>
+  <listitem><para>Download size: &hicolor-icon-theme-size;</para></listitem>
+  <listitem><para>Estimated disk space required: &hicolor-icon-theme-buildsize;</para></listitem>
+  <listitem><para>Estimated build time: &hicolor-icon-theme-time;</para></listitem>
+</itemizedlist>
 </sect3>
 
@@ -54,6 +54,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>
@@ -62,14 +65,28 @@
 <title>Contents</title>
 
-<para>The <application>hicolor-icon-theme</application> package contains
-<filename>/usr/share/icons/hicolor/*</filename>.</para>
+<segmentedlist>
+  <segtitle>Installed Programs</segtitle>
+  <segtitle>Installed Libraries</segtitle>
+  <segtitle>Installed Directories</segtitle>
+ 
+  <seglistitem>
+    <seg>None</seg>
+    <seg>None</seg>
+    <seg>/usr/share/icons/hicolor/</seg>
+  </seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+  <?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
+<varlistentry id="hicolor-icon-themes">
+  <term>/usr/share/icons/hicolor/*</term>
+  <listitem>
+    <para> contains icon definitions used as defaults.</para>
+  </listitem>
+</varlistentry>
 
-<sect3><title>HiColor Icons</title>
-<para><filename>/usr/share/icons/hicolor/*</filename> contains icon definitions 
-used as defaults.</para></sect3>
+</variablelist> 
 
 </sect2>
