Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision b9d0ddda04e2d4564272bea263dccda1213fc960)
+++ x/wm/sawfish.xml	(revision 09fcdddeee58d87a6c6dd9ac8f9d23a0ec702296)
@@ -5,154 +5,177 @@
   %general-entities;
 
-<!ENTITY sawfish-download-http "http://prdownloads.sourceforge.net/sawmill/sawfish-&sawfish-version;.tar.gz">
-<!ENTITY sawfish-download-ftp  " ">
-<!ENTITY sawfish-md5sum        "9e5ce5e76c60acecdb1889c1f173295a">
-<!ENTITY sawfish-size          "1.5 MB">
-<!ENTITY sawfish-buildsize     "17.5 MB">
-<!ENTITY sawfish-time          "0.26 SBU">
+  <!ENTITY sawfish-download-http "http://prdownloads.sourceforge.net/sawmill/sawfish-&sawfish-version;.tar.gz">
+  <!ENTITY sawfish-download-ftp  " ">
+  <!ENTITY sawfish-md5sum        "9e5ce5e76c60acecdb1889c1f173295a">
+  <!ENTITY sawfish-size          "1.5 MB">
+  <!ENTITY sawfish-buildsize     "17.5 MB">
+  <!ENTITY sawfish-time          "0.26 SBU">
 ]>
 
 <sect1 id="sawfish" xreflabel="sawfish-&sawfish-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="sawfish.html" ?>
-<title>sawfish-&sawfish-version;</title>
-<indexterm zone="sawfish"><primary
-sortas="a-Sawfish">Sawfish</primary></indexterm>
+  <?dbhtml filename="sawfish.html" ?>
 
-<sect2>
-<title>Introduction to <application>sawfish</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>sawfish</application> package contains a window manager. 
-This is useful for organizing and displaying windows where all window 
-decorations are configurable and all user-interface policy is controlled 
-through the extension language.</para>
+  <title>sawfish-&sawfish-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&sawfish-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&sawfish-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &sawfish-md5sum;</para></listitem>
-<listitem><para>Download size: &sawfish-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&sawfish-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&sawfish-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="sawfish">
+    <primary sortas="a-Sawfish">Sawfish</primary>
+  </indexterm>
 
-<sect3><title><application>sawfish</application> dependencies</title>
-<sect4><title>Required</title>
-<para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
-<xref linkend="librep"/>, 
-<xref linkend="rep-gtk"/>, 
-<xref linkend="esound"/> and 
-<xref linkend="gtk2"/></para>
-</sect4>
-</sect3>
+  <sect2>
+    <title>Introduction to sawfish</title>
 
-</sect2>
+    <para>The <application>sawfish</application> package contains a window
+    manager. This is useful for organizing and displaying windows where all
+    window decorations are configurable and all user-interface policy is
+    controlled through the extension language.</para>
 
-<sect2>
-<title>Installation of <application>sawfish</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&sawfish-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&sawfish-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &sawfish-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &sawfish-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &sawfish-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &sawfish-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application>sawfish</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">sawfish Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info \
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>),
+    <xref linkend="librep"/>,
+    <xref linkend="rep-gtk"/>,
+    <xref linkend="esound"/> and
+    <xref linkend="gtk2"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of sawfish</title>
+
+    <para>Install <application>sawfish</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info \
   --disable-themer &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>--with-audiofile</option>: This command directs
-<application>sawfish</application> to use 
-<filename class="libraryfile">libaudiofile</filename> 
-for sound manipulation.</para>
+    <para><parameter>--disable-themer</parameter>: This
+    option prevents building the <application>sawfish</application> themer.
+    This program was not migrated to <application>GTK-2</application>.</para>
 
-<para><option>--with-esd</option>: This command directs <application>
-sawfish</application> to use the Enlightened Sound Daemon.</para>
+    <para><option>--with-audiofile</option>: This command directs
+    <application>sawfish</application> to use
+    <filename class="libraryfile">libaudiofile</filename>
+    for sound manipulation.</para>
 
-<para><option>--disable-themer</option>: This
-option prevents building the <application>sawfish</application> themer.
-This program was not migrated to <application>GTK-2</application>.</para> 
+    <para><option>--with-esd</option>: This command directs
+    <application>sawfish</application> to use the Enlightened Sound
+    Daemon.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Configuring <application>sawfish</application></title>
+  <sect2 role="configuration">
+    <title>Configuring sawfish</title>
 
-<sect3 id="sawfish-config"><title>Configuration Information</title>
-<indexterm zone="sawfish sawfish-config">
-<primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
-</indexterm>
-<para>Be sure to backup your current <filename>.xinitrc</filename>
-before proceeding.</para>
+    <sect3 id="sawfish-config">
+      <title>Configuration Information</title>
 
-<screen><userinput><command>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"</command>
-exec sawfish
-<command>EOF</command></userinput></screen>
-</sect3>
+      <indexterm zone="sawfish sawfish-config">
+        <primary sortas="e-AA.xinitrc">~/.xinitrc</primary>
+      </indexterm>
 
-</sect2>
+      <para>Be sure to backup your current <filename>.xinitrc</filename>
+      before proceeding.</para>
 
-<sect2>
-<title>Contents</title>
+<screen><userinput>cat &gt;&gt; ~/.xinitrc &lt;&lt; "EOF"
+<literal>exec sawfish</literal>
+EOF</userinput></screen>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directory</segtitle>
-<seglistitem>
-<seg>sawfish, sawfish-client and sawfish-ui</seg>
-<seg>None</seg>
-<seg>/usr/share/sawfish, /usr/sbin/sawfish and /usr/lib/rep/*/</seg>
-</seglistitem>
-</segmentedlist>
+    </sect3>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+  </sect2>
 
-<varlistentry id="sawfish-prog">
-<term><filename>sawfish</filename></term>
-<listitem><para>is the extensible window manager using a
-<application>Lisp</application>-based scripting language.</para>
-<indexterm zone="sawfish sawfish-prog">
-<primary sortas="b-sawfish">sawfish</primary></indexterm>
-</listitem>
-</varlistentry>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<varlistentry id="sawfish-client">
-<term><filename>sawfish-client</filename></term>
-<listitem><para>allows you to connect to a window manager process and
-evaluate arbitrary <application>Lisp</application> forms.</para>
-<indexterm zone="sawfish sawfish-client">
-<primary sortas="b-sawfish-client">sawfish-client</primary></indexterm>
-</listitem>
-</varlistentry>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
 
-<varlistentry id="sawfish-ui">
-<term><filename>sawfish-ui</filename></term>
-<listitem><para>is the <application>sawfish</application> configurator.</para>
-<indexterm zone="sawfish sawfish-ui">
-<primary sortas="b-sawfish-ui">sawfish-ui</primary></indexterm>
-</listitem>
-</varlistentry>
+      <seglistitem>
+        <seg>sawfish, sawfish-client, and sawfish-ui</seg>
+        <seg>None</seg>
+        <seg>/usr/share/sawfish, /usr/sbin/sawfish, and /usr/lib/rep/*/</seg>
+      </seglistitem>
+    </segmentedlist>
 
-</variablelist>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-</sect2>
+      <varlistentry id="sawfish-prog">
+        <term><filename>sawfish</filename></term>
+        <listitem>
+          <para>is the extensible window manager using a
+          <application>Lisp</application>-based scripting language.</para>
+          <indexterm zone="sawfish sawfish-prog">
+            <primary sortas="b-sawfish">sawfish</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sawfish-client">
+        <term><filename>sawfish-client</filename></term>
+        <listitem>
+          <para>allows you to connect to a window manager process and
+          evaluate arbitrary <application>Lisp</application> forms.</para>
+          <indexterm zone="sawfish sawfish-client">
+            <primary sortas="b-sawfish-client">sawfish-client</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sawfish-ui">
+        <term><filename>sawfish-ui</filename></term>
+        <listitem>
+          <para>is the <application>sawfish</application> configurator.</para>
+          <indexterm zone="sawfish sawfish-ui">
+            <primary sortas="b-sawfish-ui">sawfish-ui</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
-
