Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision cbc6a3b6394fa48faf9eb5e6e01983432f562c13)
+++ general/sysutils/zip.xml	(revision d0006cd857e78702a963c17231738dda0ecd6fd7)
@@ -5,139 +5,159 @@
   %general-entities;
 
-<!ENTITY zip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/zip231.tar.gz">
-<!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz">
-<!ENTITY zip-md5sum "6bfc076664416251d7624ab3538d1cb9">
-<!ENTITY zip-size "781 KB">
-<!ENTITY zip-buildsize "4.1 MB">
-<!ENTITY zip-time "0.04 SBU">
+  <!ENTITY zip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/zip231.tar.gz">
+  <!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz">
+  <!ENTITY zip-md5sum "6bfc076664416251d7624ab3538d1cb9">
+  <!ENTITY zip-size "781 KB">
+  <!ENTITY zip-buildsize "4.1 MB">
+  <!ENTITY zip-time "0.04 SBU">
 ]>
 
 <sect1 id="zip" xreflabel="Zip-&zip-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="zip.html"?>
-<title>Zip-&zip-version;</title>
-<indexterm zone="zip">
-<primary sortas="a-Zip">Zip</primary></indexterm>
+  <?dbhtml filename="zip.html"?>
 
-<sect2>
-<title>Introduction to <application>Zip</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>Zip</application> package contains
-<application>Zip</application> utilities. These
-are useful for compressing files into <filename>ZIP</filename> archives.</para>
+  <title>Zip-&zip-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&zip-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&zip-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &zip-md5sum;</para></listitem>
-<listitem><para>Download size: &zip-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&zip-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&zip-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="zip">
+    <primary sortas="a-Zip">Zip</primary>
+  </indexterm>
 
-</sect2>
+  <sect2 role="package">
+    <title>Introduction to Zip</title>
 
-<sect2>
-<title>Installation of <application>Zip</application></title>
+    <para>The <application>Zip</application> package contains
+    <application>Zip</application> utilities. These
+    are useful for compressing files into <filename>ZIP</filename> archives.</para>
 
-<para>Install <application>Zip</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&zip-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&zip-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &zip-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &zip-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &zip-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &zip-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<screen><userinput><command>sed -i -e 's@$(INSTALL) man/zip.1@$(INSTALL_PROGRAM) man/zip.1@' \
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Zip</title>
+
+    <para>Install <application>Zip</application> by running the following 
+    commands:</para>
+
+<screen><userinput>sed -i -e 's@$(INSTALL) man/zip.1@$(INSTALL_PROGRAM) man/zip.1@' \
     unix/Makefile &amp;&amp;
-make prefix=/usr -f unix/Makefile generic_gcc</command></userinput></screen>
+make prefix=/usr -f unix/Makefile generic_gcc</userinput></screen>
 
-<para>This package does not come with a test suite.</para>
+    <para>This package does not come with a test suite.</para>
 
-<para>Now, as the root user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen><userinput role='root'><command>make prefix=/usr -f unix/Makefile install</command></userinput></screen>
+<screen role="root"><userinput>make prefix=/usr -f unix/Makefile install</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Command explanations</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<para><command>sed -i -e ... unix/Makefile</command>: The 
-<filename>Makefile</filename> has a bug which causes the installation to fail. 
-This command fixes the problem.</para>
+    <para><command>sed -i -e ... unix/Makefile</command>: The 
+    <filename>Makefile</filename> has a bug which causes the installation to fail. 
+    This command fixes the problem.</para>
 
-<para><command>make prefix=/usr -f unix/Makefile generic_gcc</command>: This 
-command overrides the <varname>prefix</varname> variable that is set to
-<filename class='directory'>/usr/local</filename> in the
-<filename>unix/Makefile</filename> which is used as a 
-<command>Makefile</command> and builds the executables for a Linux system. The 
-alternatives to 'generic_gcc' can be seen with a 
-<command>make -f unix/Makefile list</command> command.</para>
+    <para><command>make prefix=/usr -f unix/Makefile generic_gcc</command>: This 
+    command overrides the <varname>prefix</varname> variable that is set to
+    <filename class='directory'>/usr/local</filename> in the
+    <filename>unix/Makefile</filename> which is used as a 
+    <command>Makefile</command> and builds the executables for a Linux system. The 
+    alternatives to <option>generic_gcc</option> can be seen with a 
+    <command>make -f unix/Makefile list</command> command.</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>zip, zipcloak, zipnote, zipsplit</seg>
-<seg>None</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
+      <seglistitem>
+        <seg>zip, zipcloak, zipnote, and zipsplit</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="zip-prog">
-<term><command>zip</command></term>
-<listitem><para>compresses files into a <filename>ZIP</filename> 
-archive.</para>
-<indexterm zone="zip zip-prog">
-<primary sortas="b-zip">zip</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="zip-prog">
+        <term><command>zip</command></term>
+        <listitem>
+          <para>compresses files into a <filename>ZIP</filename> archive.</para>
+          <indexterm zone="zip zip-prog">
+            <primary sortas="b-zip">zip</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="zipcloak">
-<term><command>zipcloak</command></term>
-<listitem><para>is disabled in this version of <application>Zip</application>. 
-It will display a message about how to support encryption by recompiling with 
-<filename>zcrypt27.zip</filename>.</para>
-<indexterm zone="zip zipcloak">
-<primary sortas="b-zipcloak">zipcloak</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="zipcloak">
+        <term><command>zipcloak</command></term>
+        <listitem>
+          <para>is disabled in this version of <application>Zip</application>. 
+          It will display a message about how to support encryption by recompiling with 
+          <filename>zcrypt27.zip</filename>.</para>
+          <indexterm zone="zip zipcloak">
+            <primary sortas="b-zipcloak">zipcloak</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="zipnote">
-<term><command>zipnote</command></term>
-<listitem><para>reads or writes comments stored in a <filename>ZIP</filename> 
-file.</para>
-<indexterm zone="zip zipnote">
-<primary sortas="b-zipnote">zipnote</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="zipnote">
+        <term><command>zipnote</command></term>
+        <listitem>
+          <para>reads or writes comments stored in a <filename>ZIP</filename> 
+          file.</para>
+          <indexterm zone="zip zipnote">
+            <primary sortas="b-zipnote">zipnote</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-<varlistentry id="zipsplit">
-<term><command>zipsplit</command></term>
-<listitem><para>is a utility to split <filename>ZIP</filename> files into 
-smaller files.</para>
-<indexterm zone="zip zipsplit">
-<primary sortas="b-zipsplit">zipsplit</primary>
-</indexterm></listitem>
-</varlistentry>
+      <varlistentry id="zipsplit">
+        <term><command>zipsplit</command></term>
+        <listitem>
+          <para>is a utility to split <filename>ZIP</filename> files into 
+          smaller files.</para>
+          <indexterm zone="zip zipsplit">
+            <primary sortas="b-zipsplit">zipsplit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
-</variablelist>
+    </variablelist>
 
-</sect2>
+  </sect2>
 
 </sect1>
