Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 514ef84dee85a578ab67b7fa329c97cde7d5fd69)
+++ general/sysutils/cpio.xml	(revision 35f3cb4451aa16a36a5a4dc1a44bda2c33d892f6)
@@ -5,122 +5,140 @@
   %general-entities;
 
-<!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
-<!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
-<!ENTITY cpio-md5sum "76b4145f33df088a5bade3bf4373d17d">
-<!ENTITY cpio-size "561 KB">
-<!ENTITY cpio-buildsize "5.3 MB">
-<!ENTITY cpio-time "0.12 SBU">
+  <!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
+  <!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
+  <!ENTITY cpio-md5sum "76b4145f33df088a5bade3bf4373d17d">
+  <!ENTITY cpio-size "561 KB">
+  <!ENTITY cpio-buildsize "5.3 MB">
+  <!ENTITY cpio-time "0.12 SBU">
 ]>
 
 <sect1 id="cpio" xreflabel="cpio-&cpio-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="cpio.html"?>
-<title>cpio-&cpio-version;</title>
-<indexterm zone="cpio">
-<primary sortas="a-Cpio">Cpio</primary></indexterm>
+  <?dbhtml filename="cpio.html"?>
 
-<sect2>
-<title>Introduction to <application>cpio</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>cpio</application> package contains
-tools for archiving.</para>
+  <title>Cpio-&cpio-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&cpio-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&cpio-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &cpio-md5sum;</para></listitem>
-<listitem><para>Download size: &cpio-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&cpio-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&cpio-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="cpio">
+    <primary sortas="a-Cpio">Cpio</primary>
+  </indexterm>
 
-</sect2>
+  <sect2>
+    <title>Introduction to Cpio</title>
 
-<sect2>
-<title>Installation of <application>cpio</application></title>
+    <para>The <application>cpio</application> package contains
+    tools for archiving.</para>
 
-<para>Install <application>cpio</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&cpio-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&cpio-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &cpio-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &cpio-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &cpio-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &cpio-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c &amp;&amp;
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Cpio</title>
+
+    <para>Install <application>cpio</application> by running the following 
+    commands:</para>
+
+<screen><userinput>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c &amp;&amp;
 ./configure CPIO_MT_PROG=mt --prefix=/usr \
     --bindir=/bin --libexecdir=/tmp \
     --with-rmt=/usr/sbin/rmt &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><command>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c</command>: 
-This command fixes a build problem in the <command>mt</command> program.</para>
+    <para><command>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c</command>: 
+    This command fixes a build problem in the <command>mt</command> program.</para>
 
-<para><parameter>CPIO_MT_PROG=mt</parameter>: This parameter forces the 
-building and installation of the <command>mt</command> program.</para>
+    <para><parameter>CPIO_MT_PROG=mt</parameter>: This parameter forces the 
+    building and installation of the <command>mt</command> program.</para>
 
-<para><parameter>--bindir=/bin</parameter>: This parameter installs 
-<command>cpio</command> to <filename class="directory">/bin</filename> instead 
-of <filename class="directory">/usr/bin</filename> as recommended by the 
-<acronym>FHS</acronym> guidelines.</para>
+    <para><parameter>--bindir=/bin</parameter>: This parameter installs 
+    <command>cpio</command> to <filename class="directory">/bin</filename> instead 
+    of <filename class="directory">/usr/bin</filename> as recommended by the 
+    FHS guidelines.</para>
 
-<para><parameter>--libexecdir=/tmp</parameter>: This parameter is used so 
-that <filename class='directory'>/usr/libexec</filename> is not created.</para>
+    <para><parameter>--libexecdir=/tmp</parameter>: This parameter is used so 
+    that <filename class='directory'>/usr/libexec</filename> is not created.</para>
 
-<para><parameter>--with-rmt=/usr/sbin/rmt</parameter>: This parameter inhibits 
-building the <command>rmt</command> program as it is already installed by the 
-<application>tar</application> package in <acronym>LFS</acronym>.</para>
+    <para><parameter>--with-rmt=/usr/sbin/rmt</parameter>: This parameter inhibits 
+    building the <command>rmt</command> program as it is already installed by the 
+    <application>tar</application> package in LFS.</para>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-<seglistitem>
-<seg>cpio and mt</seg>
-<seg>None</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>cpio and mt</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
 
-<varlistentry id="cpio-prog">
-<term><command>cpio</command></term>
-<listitem><para>copies files to and from archives.</para>
-<indexterm zone="cpio cpio-prog">
-<primary sortas="b-cpio">cpio</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="cpio-prog">
+        <term><command>cpio</command></term>
+        <listitem>
+          <para>copies files to and from archives.</para>
+          <indexterm zone="cpio cpio-prog">
+            <primary sortas="b-cpio">cpio</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="mt">
-<term><command>mt</command></term>
-<listitem><para>controls magnetic tape drive operations.</para>
-<indexterm zone="cpio mt">
-<primary sortas="b-mt">mt</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
+      <varlistentry id="mt">
+        <term><command>mt</command></term>
+        <listitem>
+          <para>controls magnetic tape drive operations.</para>
+          <indexterm zone="cpio mt">
+            <primary sortas="b-mt">mt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</sect2>
+    </variablelist>
+
+  </sect2>
 
 </sect1>
