Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision 469ad5d0118b7d93e6562bf23ae39ebd12c70c7c)
+++ general/genlib/popt.xml	(revision 36f0d751065d30ab99dd64e2cc80d9529b66a0cd)
@@ -5,119 +5,126 @@
   %general-entities;
 
-<!ENTITY popt-download-http "http://ftp.debian.org/debian/pool/main/p/popt/popt_1.7.orig.tar.gz">
-<!ENTITY popt-download-ftp "ftp://ftp.debian.org/debian/pool/main/p/popt/popt_1.7.orig.tar.gz">
-<!ENTITY popt-md5sum "5988e7aeb0ae4dac8d83561265984cc9">
-<!ENTITY popt-size "562 KB">
-<!ENTITY popt-buildsize "5.5 MB">
-<!ENTITY popt-time "0.17 SBU">
+  <!ENTITY popt-download-http "http://ftp.debian.org/debian/pool/main/p/popt/popt_1.7.orig.tar.gz">
+  <!ENTITY popt-download-ftp "ftp://ftp.debian.org/debian/pool/main/p/popt/popt_1.7.orig.tar.gz">
+  <!ENTITY popt-md5sum "5988e7aeb0ae4dac8d83561265984cc9">
+  <!ENTITY popt-size "562 KB">
+  <!ENTITY popt-buildsize "5.5 MB">
+  <!ENTITY popt-time "0.17 SBU">
 ]>
 
 <sect1 id="popt" xreflabel="popt-&popt-version;-5">
+  <?dbhtml filename="popt.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>Popt-&popt-version;-5</title>
+  
+  <indexterm zone="popt">
+    <primary sortas="a-Popt">Popt</primary>
+  </indexterm>
 
-<sect1info>
-  <othername>$LastChangedBy$</othername>
-  <date>$Date$</date>
-</sect1info>
+  <sect2 role="package">
+    <title>Introduction to Popt</title>
+    
+    <para>The <application>popt</application> package contains the 
+    <application>popt</application> libraries which are used by
+    some programs to parse command-line options.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&popt-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&popt-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &popt-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &popt-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &popt-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &popt-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Patch level upgrade: <ulink
+        url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para>
+      </listitem>
+    </itemizedlist>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of Popt</title>
 
-<?dbhtml filename="popt.html"?>
+    <para>Install <application>popt</application> by running the following 
+    commands:</para>
 
-<title><application>popt</application>-&popt-version;-5</title>
-
-<indexterm zone="popt">
-  <primary sortas="a-Popt">Popt</primary>
-</indexterm>
-
-<sect2>
-<title>Introduction to <application>popt</application></title>
-
-<para>The <application>popt</application> package contains the 
-<application>popt</application> libraries which are used by
-some programs to parse command-line options.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-  <listitem><para>Download (HTTP): 
-    <ulink url="&popt-download-http;"/></para></listitem>
-  <listitem><para>Download (FTP): 
-    <ulink url="&popt-download-ftp;"/></para></listitem>
-  <listitem><para>Download MD5 sum: &popt-md5sum;</para></listitem>
-  <listitem><para>Download size: &popt-size;</para></listitem>
-  <listitem><para>Estimated disk space required: 
-    &popt-buildsize;</para></listitem>
-  <listitem><para>Estimated build time: 
-    &popt-time;</para></listitem>
-</itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-  <listitem><para>Patch level upgrade: <ulink
-    url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para>
-  </listitem>
-</itemizedlist>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>popt</application></title>
-
-<para>Install <application>popt</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>patch -Np1 -i ../popt_&popt-version;-5.diff &amp;&amp;
+<screen><userinput>patch -Np1 -i ../popt_&popt-version;-5.diff &amp;&amp;
 ./configure --prefix=/usr &amp;&amp;
 cp configure.in configure.ac &amp;&amp;
 touch configure.in configure.ac &amp;&amp;
-make</command></userinput></screen>
+make</userinput></screen>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make install</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+ 
+    <para><command>cp configure.in configure.ac</command>:
+    Because <filename>configure.in</filename> is updated with the patch,
+    this file is needed for <command>make</command> to work properly.</para>
+    
+    <para><command>touch configure.in configure.ac</command>:
+    Ensure file timestamps are the same.</para>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>Now, as the root user:</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libpopt.[so,a]</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+    
+      <varlistentry id="libpopt">
+      <term><filename role='library'>libpopt.[so,a]</filename></term>
+      <listitem>
+        <para> is used to parse command-line options.</para>
+        <indexterm zone="popt libpopt">
+          <primary sortas="c-libpopt">libpopt.[so,a]</primary>
+        </indexterm>
+      </listitem>
+      </varlistentry>
+    </variablelist>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
- 
-<para><command>cp configure.in configure.ac</command>:
-Because <filename>configure.in</filename> is updated with the patch,
-this file is needed for <command>make</command> to work properly.</para>
- 
-<para><command>touch configure.in configure.ac</command>:
-Ensure file timestamps are the same.</para>
- 
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-  <segtitle>Installed Programs</segtitle>
-  <segtitle>Installed Library</segtitle>
-  <segtitle>Installed Directories</segtitle>
-  <seglistitem>
-    <seg>None</seg>
-    <seg>libpopt.[so,a]</seg>
-    <seg>None</seg>
-  </seglistitem>
-</segmentedlist>
-
-<variablelist>
-  <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-  <?dbfo list-presentation="list"?>
-
-  <varlistentry id="libpopt">
-  <term><filename role='library'>libpopt.[so,a]</filename></term>
-  <listitem>
-    <para> is used to parse command-line options.</para>
-    <indexterm zone="popt libpopt">
-      <primary sortas="c-libpopt">libpopt.[so,a]</primary>
-     </indexterm>
-  </listitem>
-  </varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>
