Index: postlfs/security/gnupg.xml
===================================================================
--- postlfs/security/gnupg.xml	(revision 9f8e39faf8ab8ab9775125216df4017874046e82)
+++ postlfs/security/gnupg.xml	(revision 07d11f5c144a23b791cc53c463a10a2dd4b55c63)
@@ -7,5 +7,5 @@
   <!ENTITY gnupg-download-http "http://public.ftp.planetmirror.com/pub/gnupg/gnupg-&gnupg-version;.tar.bz2">
   <!ENTITY gnupg-download-ftp  "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-&gnupg-version;.tar.bz2">
-  <!ENTITY gnupg-md5           "fdfc5553d0904cd65011e47a42a9532c">
+  <!ENTITY gnupg-md5sum        "fdfc5553d0904cd65011e47a42a9532c">
   <!ENTITY gnupg-size          "2.8 MB">
   <!ENTITY gnupg-buildsize     "32 MB">
@@ -14,129 +14,154 @@
 
 <sect1 id="gnupg" xreflabel="GnuPG-&gnupg-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="gnupg.html"?>
-<title>GnuPG-&gnupg-version;</title>
-<indexterm zone="gnupg">
-<primary sortas="a-GnuPG">GnuPG</primary></indexterm>
+  <?dbhtml filename="gnupg.html"?>
 
-<sect2>
-<title>Introduction to <application>GnuPG</application></title>
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
 
-<para>The <application>GnuPG</application> package contains a public/private
-key encryptor. This is becoming useful for signing files or emails as proof 
-of identity and preventing tampering with contents of the file or email.</para>
+  <title>GnuPG-&gnupg-version;</title>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gnupg-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gnupg-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 Sum: &gnupg-md5;</para></listitem>
-<listitem><para>Download size: &gnupg-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&gnupg-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gnupg-time;</para></listitem></itemizedlist>
-</sect3>
+  <indexterm zone="gnupg">
+    <primary sortas="a-GnuPG">GnuPG</primary>
+  </indexterm>
 
-<!-- <sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink 
-url="&patch-root;/gnupg-&gnupg-version;-po_install_fix-1.patch"/>
-</para></listitem>
-</itemizedlist>
-</sect3> -->
+  <sect2 role="package">
+    <title>Introduction to GnuPG</title>
 
-<sect3><title><application>GnuPG</application> dependencies</title>
-<sect4><title>Optional</title>
-<para><xref linkend="openldap"/>, 
-<xref linkend="libusb"/>, 
-<xref linkend="curl"/>, 
-<ulink url="../server/mail.html">MTA</ulink>, 
-<xref linkend="docbook-utils"/> and <ulink 
-url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink>
-</para></sect4>
-</sect3>
+    <para>The <application>GnuPG</application> package contains a 
+    public/private key encryptor. This is becoming useful for signing 
+    files or emails as proof of identity and preventing tampering with 
+    contents of the file or email.</para>
 
-</sect2>
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&gnupg-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&gnupg-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &gnupg-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &gnupg-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &gnupg-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &gnupg-time;</para>
+      </listitem>
+    </itemizedlist>
 
-<sect2>
-<title>Installation of <application>GnuPG</application></title>
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required Patch: <ulink 
+        url="&patch-root;/gnupg-&gnupg-version;-po_install_fix-1.patch"/>
+      </para>
+      </listitem>
+    </itemizedlist>
+-->
 
-<para>Install <application>GnuPG</application> by running the following 
-commands:</para>
+    <bridgehead renderas="sect3">GnuPG Dependencies</bridgehead>
 
-<screen><userinput><command>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
-make</command></userinput></screen>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para><xref linkend="openldap"/>, 
+    <xref linkend="libusb"/>, 
+    <xref linkend="curl"/>, 
+    <ulink url="../server/mail.html">MTA</ulink>, 
+    <xref linkend="docbook-utils"/> and <ulink 
+    url="http://www.oasis-open.org/docbook/tools/dtm/">docbook-to-man</ulink></para>
 
-<para>Now, as the root user:</para>
+  </sect2>
 
-<screen><userinput role='root'><command>make install &amp;&amp;
-chmod 4755 /usr/bin/gpg</command></userinput></screen>
+  <sect2 role="installation">
+    <title>Installation of GnuPG</title>
 
-</sect2>
+    <para>Install <application>GnuPG</application> by running the following 
+    commands:</para>
 
-<sect2>
-<title>Command explanations</title>
+<screen><userinput>./configure --prefix=/usr --libexecdir=/usr/lib &amp;&amp;
+make</userinput></screen>
 
-<para><parameter>--libexecdir=/usr/lib</parameter>: This command
-creates a <filename class="directory">gnupg</filename> directory in
-<filename class="directory">/usr/lib</filename> instead of
-<filename class="directory">/usr/libexec</filename>.</para>
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<para><command>chmod 4755 /usr/bin/gpg</command>: <command>gpg</command> 
-is installed setuid root to avoid swapping out sensitive data.</para>
+<screen role="root"><userinput>make install &amp;&amp;
+chmod -v 4755 /usr/bin/gpg</userinput></screen>
 
-</sect2>
+  </sect2>
 
-<sect2>
-<title>Contents</title>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-<seglistitem>
-<seg>gpg, gpgsplit and gpgv</seg>
-<seg>None</seg>
-<seg>/usr/lib/gnupg and /usr/share/gnupg</seg>
-</seglistitem>
-</segmentedlist>
+    <para><parameter>--libexecdir=/usr/lib</parameter>: This command
+    creates a <filename class="directory">gnupg</filename> directory in
+    <filename class="directory">/usr/lib</filename> instead of
+    <filename class="directory">/usr/libexec</filename>.</para>
 
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
+    <para><command>chmod -v 4755 /usr/bin/gpg</command>: 
+    <command>gpg</command> is installed setuid root to avoid swapping 
+    out sensitive data.</para>
 
-<varlistentry id="gpg">
-<term><command>gpg</command></term>
-<listitem><para>is the backend (command-line interface) for
-this Open<acronym>PGP</acronym> implementation.</para>
-<indexterm zone="gnupg gpg">
-<primary sortas="b-gpg">gpg</primary></indexterm>
-</listitem>
-</varlistentry>
+  </sect2>
 
-<varlistentry id="gpgsplit">
-<term><command>gpgsplit</command></term>
-<listitem><para>separates key rings.</para>
-<indexterm zone="gnupg gpgsplit">
-<primary sortas="b-gpgsplit">gpgsplit</primary></indexterm>
-</listitem>
-</varlistentry>
+  <sect2 role="content">
+    <title>Contents</title>
 
-<varlistentry id="gpgv">
-<term><command>gpgv</command></term>
-<listitem><para>is a verify only version of <command>gpg</command>.</para>
-<indexterm zone="gnupg gpgv">
-<primary sortas="b-gpgv">gpgv</primary></indexterm>
-</listitem>
-</varlistentry>
-</variablelist>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
-</sect2>
+      <seglistitem>
+        <seg>gpg, gpgsplit, and gpgv</seg>
+        <seg>None</seg>
+        <seg>/usr/lib/gnupg and /usr/share/gnupg</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gpg">
+        <term><command>gpg</command></term>
+        <listitem>
+          <para>is the backend (command-line interface) for
+          this OpenPGP implementation.</para>
+          <indexterm zone="gnupg gpg">
+            <primary sortas="b-gpg">gpg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgsplit">
+        <term><command>gpgsplit</command></term>
+        <listitem>
+          <para>separates key rings.</para>
+          <indexterm zone="gnupg gpgsplit">
+            <primary sortas="b-gpgsplit">gpgsplit</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpgv">
+        <term><command>gpgv</command></term>
+        <listitem>
+          <para>is a verify only version of <command>gpg</command>.</para>
+          <indexterm zone="gnupg gpgv">
+            <primary sortas="b-gpgv">gpgv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
 
 </sect1>
