Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision 2a78ab4874c6eea2462fae1cc195dd076a99b971)
+++ general/genlib/pcre.xml	(revision 469ad5d0118b7d93e6562bf23ae39ebd12c70c7c)
@@ -5,130 +5,150 @@
   %general-entities;
 
-<!ENTITY pcre-download-http " ">
-<!ENTITY pcre-download-ftp "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
-<!ENTITY pcre-md5 "813850808894d99fb5b1c41ec6335d4f">
-<!ENTITY pcre-size "465 KB">
-<!ENTITY pcre-buildsize "5.3 MB">
-<!ENTITY pcre-time "0.11 SBU">
+  <!ENTITY pcre-download-http " ">
+  <!ENTITY pcre-download-ftp "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-&pcre-version;.tar.bz2">
+  <!ENTITY pcre-md5sum "813850808894d99fb5b1c41ec6335d4f">
+  <!ENTITY pcre-size "465 KB">
+  <!ENTITY pcre-buildsize "5.3 MB">
+  <!ENTITY pcre-time "0.11 SBU">
 ]>
 
 <sect1 id="pcre" xreflabel="PCRE-&pcre-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="pcre.html"?>
-<title>PCRE-&pcre-version;</title>
-<indexterm zone="pcre">
-<primary sortas="a-PCRE">PCRE</primary></indexterm>
+  <?dbhtml filename="pcre.html"?>
+  
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+  
+  <title>PCRE-&pcre-version;</title>
+  
+  <indexterm zone="pcre">
+    <primary sortas="a-PCRE">PCRE</primary>
+  </indexterm>
 
-<sect2>
-<title>Introduction to 
-<application><acronym>PCRE</acronym></application></title>
+  <sect2 role="package">
+    <title>Introduction to PCRE</title>
+    
+    <para>The <application>PCRE</application> package contains
+    <application>Perl</application> Compatible Regular Expression
+    libraries. These are useful for implementing regular expression pattern
+    matching using the same syntax and semantics as
+    <application>Perl</application> 5.</para>
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&pcre-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&pcre-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &pcre-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &pcre-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &pcre-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &pcre-time;</para>
+      </listitem>
+    </itemizedlist>
+    
+  </sect2>
+  
+  <sect2 role="installation">
+    <title>Installation of PCRE</title>
 
-<para>The <application><acronym>PCRE</acronym></application> package contains
-<application>Perl</application> Compatible Regular Expression
-libraries. These are useful for implementing regular expression pattern
-matching using the same syntax and semantics as
-<application>Perl</application> 5.</para>
+    <para>Install <application>PCRE</application> by running 
+    the following commands:</para>
 
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&pcre-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&pcre-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 Sum: &pcre-md5;</para></listitem>
-<listitem><para>Download size: &pcre-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&pcre-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&pcre-time;</para></listitem></itemizedlist>
-</sect3>
-</sect2>
+<screen><userinput>./configure --prefix=/usr --enable-utf8 &amp;&amp;
+make</userinput></screen>
+    
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    
+<screen role="root"><userinput>make install</userinput></screen>
 
-<sect2>
-<title>Installation of 
-<application><acronym>PCRE</acronym></application></title>
+    <para>If you reinstall <application>grep</application> after installing 
+    <application>pcre</application>, <application>grep</application> will get 
+    linked against <application>pcre</application> and may cause problems if 
+    <filename class="directory">/usr</filename> is a separate mount point. To avoid 
+    this, either pass the option <option>--disable-perl-regexp</option> when executing 
+    <command>./configure</command> for <application>grep</application> or move 
+    <filename class="libraryfile">libpcre</filename> to <filename 
+    class="directory">/lib</filename> as follows.</para>
 
-<para>Install <application><acronym>PCRE</acronym></application> by running 
-the following commands:</para>
+<screen role="root"><userinput>mv -v /usr/lib/libpcre.so.* /lib/ &amp;&amp;
+ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</userinput></screen>
+    
+  </sect2>
+  
+  <sect2 role="commands">
+    <title>Command Explanations</title>
 
-<screen><userinput><command>./configure --prefix=/usr --enable-utf8 &amp;&amp;
-make</command></userinput></screen>
+    <para><parameter>--enable-utf8</parameter>: This switch includes the code for 
+    handling UTF-8 character strings in the library.</para>
+    
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Contents</title>
 
-<para>Now, as the root user:</para>
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+      
+      <seglistitem>
+        <seg>pcregrep, pcretest, and pcre-config</seg>
+        <seg>libpcre.[so,a] and libpcreposix.[so,a]</seg>
+      <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+    
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+      
+      <varlistentry id="pcregrep">
+        <term><command>pcregrep</command></term>
+        <listitem>
+          <para>is a <command>grep</command> that understands 
+          <application>Perl</application> compatible regular expressions.</para>
+          <indexterm zone="pcre pcregrep">
+            <primary sortas="b-pcregrep">pcregrep</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="pcretest">
+        <term><command>pcretest</command></term>
+        <listitem>
+          <para>can test a <application>Perl</application> compatible 
+          regular expression.</para>
+          <indexterm zone="pcre pcretest">
+            <primary sortas="b-pcretest">pcretest</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+      
+      <varlistentry id="pcre-config">
+        <term><command>pcre-config</command></term>
+        <listitem>
+          <para>is used during the compile process of programs linking to 
+          the <application>PCRE</application> libraries.</para>
+          <indexterm zone="pcre pcre-config">
+            <primary sortas="b-pcre-config">pcre-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    
+    </variablelist>
 
-<screen><userinput role='root'><command>make install</command></userinput></screen>
-
-<para>If you reinstall <application>grep</application> after installing 
-<application>pcre</application>, <application>grep</application> will get 
-linked against <application>pcre</application> and may cause problems if 
-<filename>/usr</filename> is a separate mount point. To avoid this, either 
-pass the option <emphasis>--disable-perl-regexp</emphasis> when executing 
-<command>./configure</command> for <application>grep</application> or move 
-<filename>libpcre</filename> to <filename>/lib</filename> as follows.</para>
-
-<screen><userinput><command>mv -v /usr/lib/libpcre.so.* /lib/ &amp;&amp;
-ln -v -sf ../../lib/libpcre.so.0 /usr/lib/libpcre.so</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>--enable-utf8</parameter>: This switch includes the code for 
-handling <acronym>UTF</acronym>-8 character strings in the library.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<segmentedlist>
-<segtitle>Installed Programs</segtitle>
-<segtitle>Installed Libraries</segtitle>
-<segtitle>Installed Directories</segtitle>
-
-<seglistitem>
-<seg>pcregrep, pcretest and pcre-config</seg>
-<seg>libpcre.[so,a] and libpcreposix.[so,a]</seg>
-<seg>None</seg>
-</seglistitem>
-</segmentedlist>
-
-<variablelist>
-<bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-
-<varlistentry id="pcregrep">
-<term><command>pcregrep</command></term>
-<listitem><para>is a <command>grep</command> that understands 
-<application>Perl</application> compatible regular expressions.</para>
-<indexterm zone="pcre pcregrep">
-<primary sortas="b-pcregrep">pcregrep</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pcretest">
-<term><command>pcretest</command></term>
-<listitem><para>can test a <application>Perl</application> compatible 
-regular expression.</para>
-<indexterm zone="pcre pcretest">
-<primary sortas="b-pcretest">pcretest</primary>
-</indexterm></listitem>
-</varlistentry>
-
-<varlistentry id="pcre-config">
-<term><command>pcre-config</command></term>
-<listitem><para>is used during the compile process of programs linking to 
-the <application>PCRE</application> libraries.</para>
-<indexterm zone="pcre pcre-config">
-<primary sortas="b-pcre-config">pcre-config</primary>
-</indexterm></listitem>
-</varlistentry>
-</variablelist>
-
-</sect2>
+  </sect2>
 
 </sect1>
