Index: general/sysutils/pciutils.xml
===================================================================
--- general/sysutils/pciutils.xml	(revision 2571cae14adf6941b37179548e94d20bb65ec999)
+++ general/sysutils/pciutils.xml	(revision a9a6837e2efba1134b2c341a8fc61297f45bea0e)
@@ -5,119 +5,131 @@
   %general-entities;
 
-<!ENTITY pciutils-download-http "http://www.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
-<!ENTITY pciutils-download-ftp "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
-<!ENTITY pciutils-md5sum "2b3b2147b7bc91f362be55cb49fa1c4e">
-<!ENTITY pciutils-size "107 KB">
-<!ENTITY pciutils-buildsize "1.04 MB">
-<!ENTITY pciutils-time "0.01 SBU">
+  <!ENTITY pciutils-download-http "http://www.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
+  <!ENTITY pciutils-download-ftp "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
+  <!ENTITY pciutils-md5sum "2b3b2147b7bc91f362be55cb49fa1c4e">
+  <!ENTITY pciutils-size "107 KB">
+  <!ENTITY pciutils-buildsize "1.04 MB">
+  <!ENTITY pciutils-time "0.01 SBU">
 ]>
 
 <sect1 id="pciutils" xreflabel="PCI Utilities-&pciutils-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="pciutils.html"?>
-<title><application><acronym>PCI</acronym> 
-Utilities</application>-&pciutils-version;</title>
-<indexterm zone="pciutils">
-<primary sortas="a-PCI-Utilities">PCI Utilities</primary></indexterm>
+  <?dbhtml filename="pciutils.html"?>
 
-<sect2>
-<title>Introduction to <application><acronym>PCI</acronym> 
-Utilities</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application><acronym>PCI</acronym> Utilities</application> package 
-is a set of programs for listing <acronym>PCI</acronym> devices, inspecting 
-their status and setting their configuration registers.</para>
+  <title>PCI Utilities-&pciutils-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): 
-<ulink url="&pciutils-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): 
-<ulink url="&pciutils-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &pciutils-md5sum;</para></listitem>
-<listitem><para>Download size: &pciutils-size;</para></listitem>
-<listitem><para>Estimated disk space required: 
-&pciutils-buildsize;</para></listitem>
-<listitem><para>Estimated build time: 
-&pciutils-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="pciutils">
+    <primary sortas="a-PCI-Utilities">PCI Utilities</primary>
+  </indexterm>
 
-<sect3><title><application><acronym>PCI</acronym> Utilities</application> 
-dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="which"/></para>
-</sect4>
-</sect3>
+  <sect2 role="package">
+    <title>Introduction to PCI Utilities</title>
 
-</sect2>
+    <para>The <application>PCI Utilities</application> package 
+    is a set of programs for listing PCI devices, inspecting 
+    their status and setting their configuration registers.</para>
 
-<sect2>
-<title>Installation of <application><acronym>PCI</acronym> 
-Utilities</application></title>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&pciutils-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&pciutils-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &pciutils-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &pciutils-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &pciutils-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &pciutils-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<para>Install <application><acronym>PCI</acronym> Utilities</application> by
-running the following commands:</para>
+    <bridgehead renderas="sect3">PCI Utilities Dependencies</bridgehead>
 
-<screen><userinput><command>make PREFIX=/usr</command></userinput></screen>
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para><xref linkend="which"/></para>
 
-<para>Now, as the root user:</para>
+  </sect2>
 
-<screen><userinput role='root'><command>make PREFIX=/usr install</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of PCI Utilities</title>
 
-</sect2>
+    <para>Install <application>PCI Utilities</application> by
+    running the following commands:</para>
 
-<sect2>
-<title>Contents</title>
+<screen><userinput>make PREFIX=/usr</userinput></screen>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<seglistitem>
-<seg>lspci, setpci and update-pciids</seg>
-<seg>None</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
+<screen role="root"><userinput>make PREFIX=/usr install</userinput></screen>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+  </sect2>
 
-<varlistentry id="lspci">
-<term><command>lspci</command></term>
-<listitem><para>is a utility for displaying information about all 
-<acronym>PCI</acronym> buses in the system and all devices connected to 
-them.</para>
-<indexterm zone="pciutils lspci">
-<primary sortas="b-lspci">lspci</primary>
-</indexterm></listitem>
-</varlistentry>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<varlistentry id="setpci">
-<term><command>setpci</command></term>
-<listitem><para>is a utility for querying and configuring 
-<acronym>PCI</acronym> devices.</para>
-<indexterm zone="pciutils setpci">
-<primary sortas="b-setpci">setpci</primary>
-</indexterm></listitem>
-</varlistentry>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<varlistentry id="update-pciids">
-<term><command>update-pciids</command></term>
-<listitem><para>fetches the current version of the <acronym>PCI</acronym> 
-<acronym>ID</acronym> list. Requires <xref linkend="wget"/> or 
-<xref linkend="lynx"/>.</para>
-<indexterm zone="pciutils update-pciids">
-<primary sortas="b-update-pciids">update-pciids</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <seglistitem>
+        <seg>lspci, setpci and update-pciids</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-</sect2>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="lspci">
+        <term><command>lspci</command></term>
+        <listitem>
+          <para>is a utility for displaying information about all PCI buses in the 
+          system and all devices connected to them.</para>
+          <indexterm zone="pciutils lspci">
+            <primary sortas="b-lspci">lspci</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="setpci">
+        <term><command>setpci</command></term>
+        <listitem>
+          <para>is a utility for querying and configuring PCI devices.</para>
+          <indexterm zone="pciutils setpci">
+            <primary sortas="b-setpci">setpci</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="update-pciids">
+        <term><command>update-pciids</command></term>
+        <listitem>
+          <para>fetches the current version of the PCI ID list. Requires 
+          <xref linkend="wget"/> or <xref linkend="lynx"/>.</para>
+          <indexterm zone="pciutils update-pciids">
+            <primary sortas="b-update-pciids">update-pciids</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
