Index: gnome/core/libwnck.xml
===================================================================
--- gnome/core/libwnck.xml	(revision 293abe4621506d222d9568fe064aa74bf2eeeeee)
+++ gnome/core/libwnck.xml	(revision c64a089d4df93a5ec93baaff03ceb9e4e3cc6cfe)
@@ -5,90 +5,120 @@
   %general-entities;
 
-<!ENTITY libwnck-download-http "http://ftp.gnome.org/pub/GNOME/sources/libwnck/&gnome-version;/libwnck-&libwnck-version;.tar.bz2">
-<!ENTITY libwnck-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libwnck/&gnome-version;/libwnck-&libwnck-version;.tar.bz2">
-<!ENTITY libwnck-md5sum "c04c79f1e8576bc930c79d2e7bb8190a">
-<!ENTITY libwnck-size "419 KB">
-<!ENTITY libwnck-buildsize "10 MB">
-<!ENTITY libwnck-time "0.3 SBU">
+  <!ENTITY libwnck-download-http "http://ftp.gnome.org/pub/GNOME/sources/libwnck/&gnome-version;/libwnck-&libwnck-version;.tar.bz2">
+  <!ENTITY libwnck-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/libwnck/&gnome-version;/libwnck-&libwnck-version;.tar.bz2">
+  <!ENTITY libwnck-md5sum "c04c79f1e8576bc930c79d2e7bb8190a">
+  <!ENTITY libwnck-size "419 KB">
+  <!ENTITY libwnck-buildsize "10 MB">
+  <!ENTITY libwnck-time "0.3 SBU">
 ]>
 
 <sect1 id="libwnck" xreflabel="libwnck-&libwnck-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="libwnck.html"?>
-<title>libwnck-&libwnck-version;</title>
+  <?dbhtml filename="libwnck.html"?>
 
-<sect2>
-<title>Introduction to <application>libwnck</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>libwnck</application> package contains a Window 
-Navigator Construction Kit.</para>
+  <title>Libwnck-&libwnck-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&libwnck-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&libwnck-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &libwnck-md5sum;</para></listitem>
-<listitem><para>Download size: &libwnck-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&libwnck-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&libwnck-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="libwnck">
+    <primary sortas="a-Libwnck">Libwnck</primary>
+  </indexterm>
 
-<sect3><title><application>libwnck</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="gtk2"/></para>
-</sect4>
+  <sect2 role="package">
+    <title>Introduction to Libwnck</title>
 
-<sect4><title>Recommended</title>
-<para><xref linkend="startup-notification"/></para>
-</sect4>
+    <para>The <application>libwnck</application> package contains a
+    Window Navigator Construction Kit.</para>
 
-<sect4><title>Optional</title>
-<para><xref linkend="gtk-doc"/></para>
-</sect4>
-</sect3>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libwnck-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libwnck-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libwnck-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libwnck-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libwnck-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libwnck-time;</para>
+      </listitem>
+    </itemizedlist>
 
-</sect2>
+    <bridgehead renderas="sect3">TEMPLATE Dependencies</bridgehead>
 
-<sect2>
-<title>Installation of <application>libwnck</application></title>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="gtk2"/></para>
 
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="../without-gnome.xml"/>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para><xref linkend="startup-notification"/></para>
 
-<para>Install <application>libwnck</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="gtk-doc"/></para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
-make</command></userinput></screen>
+  </sect2>
 
-<para>This package does not come with a test suite.</para>
+  <sect2 role="installation">
+    <title>Installation of Libwnck</title>
 
-<para>Now, as the root user:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../without-gnome.xml"/>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+    <para>Install <application>libwnck</application> by running the
+    following commands:</para>
 
-</sect2>
+<screen><userinput>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` &amp;&amp;
+make</userinput></screen>
 
-<sect2>
-<title>Contents</title>
+    <para>This package does not come with a test suite.</para>
 
-<para>The <application>libwnck</application> package contains the 
-<filename class="libraryfile">libwnck</filename> library.</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-</sect2>
+<screen role="root"><userinput>make install</userinput></screen>
 
-<sect2><title>Description</title>
+  </sect2>
 
-<sect3><title>libwnck libraries</title>
-<para><filename class="libraryfile">libwnck</filename> library contains 
-functions for writing pagers and task lists.</para></sect3>
+  <sect2 role="content">
+    <title>Contents</title>
 
-</sect2>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libwnck-1</seg>
+        <seg>$GNOME_PREFIX/include/libwnck-1.0</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libwnck-1">
+        <term><filename class='libraryfile'>libwnck-1.[so,a]</filename></term>
+        <listitem>
+          <para>contains functions for writing pagers and task lists.</para>
+          <indexterm zone="libwnck libwnck-1">
+            <primary sortas="c-libwnck-1">libwnck-1.[so,a]</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
