Index: basicnet/mailnews/pine.xml
===================================================================
--- basicnet/mailnews/pine.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ basicnet/mailnews/pine.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -15,24 +15,24 @@
 <sect1 id="pine" xreflabel="Pine-&pine-version;">
   <?dbhtml filename="pine.html"?>
-  
+
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-  
+
   <title>Pine-&pine-version;</title>
-  
+
   <indexterm zone="pine">
     <primary sortas="a-Pine">Pine</primary>
   </indexterm>
-  
-  <sect2>
+
+  <sect2 role="package">
     <title>Introduction to Pine</title>
-    
+
     <para>The <application>Pine</application> package contains the
     <application>Pine</application> Mail User Agent and several
     server daemons for various mail protocols, in addition to some nice
     file and directory editing/browsing programs.</para>
-    
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing='compact'>
@@ -56,105 +56,105 @@
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Recommended Patch: <ulink 
+        <para>Recommended Patch: <ulink
         url="&patch-root;/pine-&pine-version;-fhs-3.patch"/></para>
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">Pine Dependencies</bridgehead>
-    
+
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="openssl"/></para>
-    
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para><xref linkend="openldap"/> and <xref linkend="mitkrb"/></para>
-    
-  </sect2>
-  
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Pine</title>
-    
-    <para>Install <application>Pine</application> by running the following 
+
+    <para>Install <application>Pine</application> by running the following
     commands:</para>
-    
+
 <screen><userinput>patch -Np1 -i ../pine-&pine-version;-fhs-3.patch &amp;&amp;
 ./build DEBUG=-O MAILSPOOL=/var/mail \
     SSLDIR=/usr SSLCERTS=/etc/ssl/certs slx &amp;&amp;
-cp -v doc/*.1 /usr/share/man/man1 &amp;&amp;    
+cp -v doc/*.1 /usr/share/man/man1 &amp;&amp;
 cd bin &amp;&amp;
 install -v -m755 pine imapd ipop2d ipop3d mailutil mtest pico \
     pilot rpdump rpload /usr/bin</userinput></screen>
-    
-  </sect2>
-  
+
+  </sect2>
+
   <sect2 role="commands">
     <title>Command Explanations</title>
-    
+
     <para><command>patch -Np1 -i ../pine-&pine-version;-fhs.patch</command>: This
     patch will make <application>Pine</application> use <filename
     class="directory">/etc</filename> for configuration files.</para>
-    
-    <para>The build procedure for <application>Pine</application> is somewhat 
-    unusual, in that options usually passed as <command>./configure</command> 
-    options or housed in $<envar>CFLAGS</envar> must all be passed on the command 
+
+    <para>The build procedure for <application>Pine</application> is somewhat
+    unusual, in that options usually passed as <command>./configure</command>
+    options or housed in $<envar>CFLAGS</envar> must all be passed on the command
     line to the <command>./build</command> script.</para>
-    
-    <para><command>./build slx</command>: <application>Pine</application> offers 
+
+    <para><command>./build slx</command>: <application>Pine</application> offers
     quite a few target platforms, slx specifies Linux using
     <option>-lcrypt</option> to get the crypt function.  See the
     <filename>doc/pine-ports</filename> file for more information and
     other authentication options.</para>
-    
+
     <para><command>DEBUG=-O</command>: This flag compiles an optimized
     version of <command>pine</command> and <command>pico</command> that
     produces no debug files.</para>
-    
+
     <para><command>MAILSPOOL=/var/mail</command>: Location of mail spool
     files, <filename class="directory">/var/mail.</filename></para>
-    
+
     <para><command>SSLDIR=/usr SSLCERTS=/etc/ssl/certs</command>: Location
     of <application>OpenSSL</application> files.</para>
-    
+
     <para><command>cd bin &amp;&amp; install ... /usr/bin</command>:
     This installs the <application>Pine</application> programs.</para>
-    
-  </sect2>
-  
+
+  </sect2>
+
   <sect2 role="configuration">
     <title>Configuring Pine</title>
-    
+
     <sect3 id="pine-config">
       <title>Config Files</title>
-      
+
       <para><filename>~/.pinerc</filename></para>
-      
+
       <indexterm zone="pine pine-config">
         <primary sortas="e-AA.pinerc">~/.pinerc</primary>
       </indexterm>
-      
+
     </sect3>
-    
+
     <sect3>
       <title>Configuration Information</title>
-      
-      <para>The <command>pine</command> executable needs no global configuration to 
-      use.  Users set <application>Pine</application> options in 
+
+      <para>The <command>pine</command> executable needs no global configuration to
+      use.  Users set <application>Pine</application> options in
       <filename>~/.pinerc</filename> using an internal configuration menu.</para>
-      
+
     </sect3>
-    
-  </sect2>
-  
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
-    
+
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
-      
+
       <seglistitem>
         <seg>imapd, ipop2d, ipop3d, mtest, pico, pilot, pine, rpdump, and rpload</seg>
@@ -163,10 +163,10 @@
       </seglistitem>
     </segmentedlist>
-    
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-      
+
       <varlistentry id="imapd-pine">
         <term><command>imapd</command></term>
@@ -178,5 +178,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="ipop2d">
         <term><command>ipop2d</command></term>
@@ -188,5 +188,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="ipop3d">
         <term><command>ipop3d</command></term>
@@ -198,5 +198,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="mtest">
         <term><command>metest</command></term>
@@ -208,5 +208,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="pico-pine">
         <term><command>pico</command></term>
@@ -219,5 +219,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="pilot">
         <term><command>pilot</command></term>
@@ -229,5 +229,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="pine-prog">
         <term><command>pine</command></term>
@@ -239,5 +239,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="rpdump">
         <term><command>rpdump</command></term>
@@ -250,5 +250,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="rpload">
         <term><command>rpload</command></term>
@@ -262,8 +262,8 @@
         </listitem>
       </varlistentry>
-      
+
     </variablelist>
-    
-  </sect2>
-  
+
+  </sect2>
+
 </sect1>
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ general/genlib/aspell.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -15,24 +15,24 @@
 <sect1 id="aspell" xreflabel="Aspell-&aspell-version;">
   <?dbhtml filename="aspell.html"?>
-  
+
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-  
+
   <title>Aspell-&aspell-version;</title>
-  
+
   <indexterm zone="aspell">
     <primary sortas="a-Aspell">Aspell</primary>
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Aspell</title>
-    
-    <para>The <application>Aspell</application> package contains an interactive 
+
+    <para>The <application>Aspell</application> package contains an interactive
     spell checking program and the <application>Aspell</application> libraries.
     <application>Aspell</application> can either be used as a library or as an
     independent spell checker.</para>
-    
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -56,59 +56,59 @@
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <para>You'll need to download at least one dictionary. The link below will take 
+    <para>You'll need to download at least one dictionary. The link below will take
     you to a page containing links to dictionaries in many languages.</para>
-    
+
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Aspell dictionaries: <ulink 
+        <para>Aspell dictionaries: <ulink
         url="ftp://ftp.gnu.org/gnu/aspell/dict"/></para>
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">Aspell Dependencies</bridgehead>
-    
+
     <bridgehead renderas="sect4">Required</bridgehead>
     <para><xref linkend="which"/></para>
-    
-  </sect2>
-  
+
+  </sect2>
+
   <sect2 role="installation">
     <title>Installation of Aspell</title>
 
-    <para>Install <application>Aspell</application> by running the following 
+    <para>Install <application>Aspell</application> by running the following
     commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &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>
 
   <sect2 role="configuration">
     <title>Configuring Aspell</title>
-    
+
     <sect3>
       <title>Configuration Information</title>
-      
-      <para>After <application>Aspell</application> is installed, you must set up at 
-      least one dictionary. Install one or more dictionaries by running the following 
+
+      <para>After <application>Aspell</application> is installed, you must set up at
+      least one dictionary. Install one or more dictionaries by running the following
       commands:</para>
-      
+
 <screen><userinput>./configure &amp;&amp;
 make</userinput></screen>
-    
+
       <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-    
+
 <screen role="root"><userinput>make install</userinput></screen>
-      
+
     </sect3>
-    
-  </sect2>
-  
+
+  </sect2>
+
   <sect2 role="content">
     <title>Contents</title>
@@ -118,7 +118,7 @@
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
-      
+
       <seglistitem>
-        <seg>aspell, aspell-import, precat, preunzip, prezip, prezip-bin, pspell-config, 
+        <seg>aspell, aspell-import, precat, preunzip, prezip, prezip-bin, pspell-config,
         run-with-aspell and word-list-compress</seg>
         <seg>libaspell.so and libpspell.so</seg>
@@ -126,16 +126,16 @@
       </seglistitem>
     </segmentedlist>
-    
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-      
+
       <varlistentry id="aspell-prog">
         <term><command>aspell</command></term>
         <listitem>
-          <para>is a utility that can function as an 
-          <command>ispell -a</command> replacement, as an independent spell checker, as 
-          a test utility to test out <application>Aspell</application> features, and as 
+          <para>is a utility that can function as an
+          <command>ispell -a</command> replacement, as an independent spell checker, as
+          a test utility to test out <application>Aspell</application> features, and as
           a utility for managing dictionaries.</para>
           <indexterm zone="aspell aspell-prog">
@@ -144,5 +144,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="aspell-import">
         <term><command>aspell-import</command></term>
@@ -155,9 +155,9 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="precat">
         <term><command>precat</command></term>
         <listitem>
-          <para>decompresses a <command>prezip</command>ped file to 
+          <para>decompresses a <command>prezip</command>ped file to
           stdout.</para>
           <indexterm zone="aspell precat">
@@ -166,5 +166,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="preunzip">
         <term><command>preunzip</command></term>
@@ -176,9 +176,9 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="prezip">
         <term><command>prezip</command></term>
         <listitem>
-          <para>is a prefix delta compressor, used to compress sorted word 
+          <para>is a prefix delta compressor, used to compress sorted word
           lists or other similar text files.</para>
           <indexterm zone="aspell prezip">
@@ -187,9 +187,9 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="prezip-bin">
         <term><command>prezip-bin</command></term>
         <listitem>
-          <para>is called by the various wrapper scripts to perform the 
+          <para>is called by the various wrapper scripts to perform the
           actual compressing and decompressing.</para>
           <indexterm zone="aspell prezip-bin">
@@ -198,10 +198,10 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="pspell-config">
         <term><command>pspell-config</command></term>
         <listitem>
-          <para>displays information about the 
-          <filename class='libraryfile'>libpspell</filename> installation, mostly for use 
+          <para>displays information about the
+          <filename class='libraryfile'>libpspell</filename> installation, mostly for use
           in build scripts.</para>
           <indexterm zone="aspell pspell-config">
@@ -210,9 +210,9 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="run-with-aspell">
         <term><command>run-with-aspell</command></term>
         <listitem>
-          <para>is a script to help use <application>Aspell</application> 
+          <para>is a script to help use <application>Aspell</application>
           as an <command>ispell</command> replacement.</para>
           <indexterm zone="aspell run-with-aspell">
@@ -221,9 +221,9 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="word-list-compress">
         <term><command>word-list-compress</command></term>
         <listitem>
-          <para>compresses or decompresses sorted word lists for use with the 
+          <para>compresses or decompresses sorted word lists for use with the
           <application>Aspell</application> spell checker.</para>
           <indexterm zone="aspell word-list-compress">
@@ -232,5 +232,5 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="libaspell">
         <term><filename class='libraryfile'>libaspell.so</filename></term>
@@ -242,11 +242,11 @@
         </listitem>
       </varlistentry>
-      
+
       <varlistentry id="libpspell">
         <term><filename class='libraryfile'>libpspell.so</filename></term>
         <listitem>
-          <para>is an interface to the 
-          <filename class='libraryfile'>libaspell</filename> library. All the spell 
-          checking funtionality is now in 
+          <para>is an interface to the
+          <filename class='libraryfile'>libaspell</filename> library. All the spell
+          checking funtionality is now in
           <filename class='libraryfile'>libaspell</filename> but this library is
           included for backwards compatibility.</para>
@@ -256,5 +256,5 @@
         </listitem>
       </varlistentry>
-    
+
     </variablelist>
 
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ general/genlib/libgsf.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -15,12 +15,12 @@
 <sect1 id="libgsf" xreflabel="libgsf-&libgsf-version;">
   <?dbhtml filename="libgsf.html"?>
-  
+
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
-  
+
   <title>Libgsf-&libgsf-version;</title>
-  
+
   <indexterm zone="libgsf">
     <primary sortas="a-Libgsf">Libgsf</primary>
@@ -29,10 +29,10 @@
   <sect2 role="package">
     <title>Introduction to Libgsf</title>
-    
-    <para>The <application>libgsf</application> package contains 
-    <filename class="libraryfile">libgsf</filename> libraries. These are useful for 
-    providing an extensible input/output abstraction layer for structured file 
+
+    <para>The <application>libgsf</application> package contains
+    <filename class="libraryfile">libgsf</filename> libraries. These are useful for
+    providing an extensible input/output abstraction layer for structured file
     formats.</para>
-    
+
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -56,40 +56,40 @@
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">Libgsf Dependencies</bridgehead>
-    
+
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para><xref linkend="glib2"/> and 
+    <para><xref linkend="glib2"/> and
     <xref linkend="libxml2"/></para>
-    
+
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="gnome-vfs"/> (required for GNOME-2 support) and 
+    <para><xref linkend="gnome-vfs"/> (required for GNOME-2 support) and
     <xref linkend="gtk-doc"/></para>
 
   </sect2>
-  
+
   <sect2 role="installation">
     <title>Installation of Libgsf</title>
 
-    <para>Install <application>libgsf</application> by running the following 
+    <para>Install <application>libgsf</application> by running the following
     commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &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>
-  
-  <sect2>
+
+  <sect2 role="content">
     <title>Contents</title>
-    
+
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
-      
+
       <seglistitem>
         <seg>None</seg>
@@ -98,5 +98,5 @@
       </seglistitem>
     </segmentedlist>
-  
+
   </sect2>
 
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ general/prog/perl-modules.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -26,15 +26,15 @@
     <title>Introduction to Perl Modules</title>
 
-    <para>The <application>Perl</application> module packages add useful objects 
-    to the <application>Perl</application> language.  Modules utilized by packages 
-    throughout BLFS are listed here, along with their dependencies. Most references to 
-    <application>Perl</application> modules are in the form of Module, Module::SubName 
-    or Module::Sub::Name, however occasionally you'll also see Module, Module-SubName 
-    or Module-Sub-Name. Most references on this page are in the latter form, as these 
+    <para>The <application>Perl</application> module packages add useful objects
+    to the <application>Perl</application> language.  Modules utilized by packages
+    throughout BLFS are listed here, along with their dependencies. Most references to
+    <application>Perl</application> modules are in the form of Module, Module::SubName
+    or Module::Sub::Name, however occasionally you'll also see Module, Module-SubName
+    or Module-Sub-Name. Most references on this page are in the latter form, as these
     are the official package names.</para>
 
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download MD5 sums (HTTP): 
+        <para>Download MD5 sums (HTTP):
         <ulink url="&perl_modules_md5sums_download_http;"/></para>
       </listitem>
@@ -51,15 +51,15 @@
     </indexterm>
 
-    <para>One module in particular is shown first, as this module's usefulness 
-    warrants installation, even though it won't be required by many other modules. 
-    The Module::Info module can tell you if a particular module is included in, 
-    or has been installed into your <application>Perl</application> installation. 
-    Additionally, the module can tell you what versions are installed and what 
-    dependencies are required for them. You can even use Module::Info to gather 
+    <para>One module in particular is shown first, as this module's usefulness
+    warrants installation, even though it won't be required by many other modules.
+    The Module::Info module can tell you if a particular module is included in,
+    or has been installed into your <application>Perl</application> installation.
+    Additionally, the module can tell you what versions are installed and what
+    dependencies are required for them. You can even use Module::Info to gather
     dependencies of uninstalled modules.</para>
 
     <itemizedlist spacing='compact'>
       <listitem>
-        <para><ulink 
+        <para><ulink
         url="http://www.cpan.org/authors/id/M/MB/MBARBON/Module-Info-&Module-Info-version;.tar.gz">
         Module-Info-&Module-Info-version;</ulink></para>
@@ -71,5 +71,5 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para id="perl-gtk-perl"><ulink 
+        <para id="perl-gtk-perl"><ulink
         url="http://www.cpan.org/authors/id/M/ML/MLEHMANN/Gtk-Perl-&Gtk-Perl-version;.tar.gz">
         Gtk-Perl-&Gtk-Perl-version;</ulink></para>
@@ -79,5 +79,5 @@
         <itemizedlist>
           <listitem>
-            <para id="perl-xml-writer"><ulink 
+            <para id="perl-xml-writer"><ulink
             url="http://www.cpan.org/authors/id/J/JO/JOSEPHW/XML-Writer-&XML-Writer-version;.tar.gz">
             XML-Writer-&XML-Writer-version;</ulink></para>
@@ -87,5 +87,5 @@
           </listitem>
           <listitem>
-            <para id="perl-xml-parser"><ulink 
+            <para id="perl-xml-parser"><ulink
             url="http://www.cpan.org/authors/id/M/MS/MSERGEANT/XML-Parser-&XML-Parser-version;.tar.gz">
             XML-Parser-&XML-Parser-version;</ulink></para>
@@ -105,5 +105,5 @@
       </listitem>
       <listitem>
-        <para id="perl-sgmlspm"><ulink 
+        <para id="perl-sgmlspm"><ulink
         url="http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-&SGMLSpm-version;.tar.gz">
         SGMLSpm-&SGMLSpm-version;</ulink></para>
@@ -113,5 +113,5 @@
       </listitem>
       <listitem>
-        <para id="perl-perl-tk"><ulink 
+        <para id="perl-perl-tk"><ulink
         url="http://www.cpan.org/authors/id/N/NI/NI-S/Tk-&Perl-Tk-version;.tar.gz">
         Tk-&Perl-Tk-version;</ulink></para>
@@ -126,5 +126,5 @@
       </listitem>
       <listitem>
-        <para id="perl-net-dns"><ulink 
+        <para id="perl-net-dns"><ulink
         url="http://www.cpan.org/authors/id/C/CR/CREIN/Net-DNS-&Net-DNS-version;.tar.gz">
         Net-DNS-&Net-DNS-version;</ulink></para>
@@ -134,5 +134,5 @@
         <itemizedlist>
           <listitem>
-            <para id="perl-digest-hmac"><ulink 
+            <para id="perl-digest-hmac"><ulink
             url="http://www.cpan.org/authors/id/G/GA/GAAS/Digest-HMAC-&Digest-HMAC-version;.tar.gz">
             Digest-HMAC-&Digest-HMAC-version;</ulink></para>
@@ -142,5 +142,5 @@
             <itemizedlist>
               <listitem>
-                <para id="perl-digest-sha1"><ulink 
+                <para id="perl-digest-sha1"><ulink
                 url="http://www.cpan.org/authors/id/G/GA/GAAS/Digest-SHA1-&Digest-SHA1-version;.tar.gz">
                 Digest-SHA1-&Digest-SHA1-version;</ulink></para>
@@ -154,5 +154,5 @@
       </listitem>
       <listitem>
-        <para id="perl-lwp"><ulink 
+        <para id="perl-lwp"><ulink
         url="http://www.cpan.org/authors/id/G/GA/GAAS/libwww-perl-&LWP-version;.tar.gz">
         LWP-&LWP-version;</ulink></para>
@@ -162,5 +162,5 @@
         <itemizedlist>
           <listitem>
-            <para id="perl-uri"><ulink 
+            <para id="perl-uri"><ulink
             url="http://www.cpan.org/authors/id/G/GA/GAAS/URI-&URI-version;.tar.gz">
             URI-&URI-version;</ulink></para>
@@ -170,5 +170,5 @@
             <itemizedlist>
               <listitem>
-                <para id="perl-business-isbn"><ulink 
+                <para id="perl-business-isbn"><ulink
                 url="http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-&Business-ISBN-version;.tar.gz">
                 Business-ISBN-&Business-ISBN-version;</ulink> (Only used during the
@@ -179,5 +179,5 @@
                 <itemizedlist>
                   <listitem>
-                    <para id="perl-business-isbn-data"><ulink 
+                    <para id="perl-business-isbn-data"><ulink
                     url="http://www.cpan.org/authors/id/B/BD/BDFOY/Business-ISBN-Data-&Business-ISBN-Data-version;.tar.gz">
                     Business-ISBN-Data-&Business-ISBN-Data-version;</ulink></para>
@@ -187,5 +187,5 @@
                     <itemizedlist>
                       <listitem>
-                        <para id="perl-test-pod"><ulink 
+                        <para id="perl-test-pod"><ulink
                         url="http://www.cpan.org/authors/id/P/PE/PETDANCE/Test-Pod-&Test-Pod-version;.tar.gz">
                         Test-Pod-&Test-Pod-version;</ulink></para>
@@ -195,5 +195,5 @@
                         <itemizedlist>
                           <listitem>
-                            <para id="perl-pod-simple"><ulink 
+                            <para id="perl-pod-simple"><ulink
                             url="http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Simple-&Pod-Simple-version;.tar.gz">
                             Pod-Simple-&Pod-Simple-version;</ulink></para>
@@ -203,5 +203,5 @@
                             <itemizedlist>
                               <listitem>
-                                <para id="perl-pod-escapes"><ulink 
+                                <para id="perl-pod-escapes"><ulink
                                 url="http://www.cpan.org/authors/id/S/SB/SBURKE/Pod-Escapes-&Pod-Escapes-version;.tar.gz">
                                 Pod-Escapes-&Pod-Escapes-version;</ulink></para>
@@ -213,5 +213,5 @@
                           </listitem>
                           <listitem>
-                            <para id="perl-test-builder-tester"><ulink 
+                            <para id="perl-test-builder-tester"><ulink
                             url="http://www.cpan.org/authors/id/M/MA/MARKF/Test-Builder-Tester-&Test-Builder-Tester-version;.tar.gz">
                             Test-Builder-Tester-&Test-Builder-Tester-version;</ulink></para>
@@ -224,5 +224,5 @@
                       </listitem>
                       <listitem>
-                        <para id="perl-test-prereq"><ulink 
+                        <para id="perl-test-prereq"><ulink
                         url="http://www.cpan.org/authors/id/B/BD/BDFOY/Test-Prereq-&Test-Prereq-version;.tar.gz">
                         Test-Prereq-&Test-Prereq-version;</ulink></para>
@@ -232,10 +232,10 @@
                         <itemizedlist>
                           <listitem>
-                            <para><ulink 
+                            <para><ulink
                             url="http://www.cpan.org/authors/id/M/MB/MBARBON/Module-Info-&Module-Info-version;.tar.gz">
                             Module-Info-&Module-Info-version;</ulink></para>
                           </listitem>
                           <listitem>
-                            <para id="perl-module-corelist"><ulink 
+                            <para id="perl-module-corelist"><ulink
                             url="http://www.cpan.org/authors/id/R/RC/RCLAMP/Module-CoreList-&Module-Corelist-version;.tar.gz">
                             Module-CoreList-&Module-Corelist-version;</ulink></para>
@@ -253,5 +253,5 @@
           </listitem>
           <listitem>
-            <para id="perl-html-parser"><ulink 
+            <para id="perl-html-parser"><ulink
             url="http://www.cpan.org/authors/id/G/GA/GAAS/HTML-Parser-&HTML-Parser-version;.tar.gz">
             HTML-Parser-&HTML-Parser-version;</ulink></para>
@@ -261,5 +261,5 @@
             <itemizedlist>
               <listitem>
-                <para id="perl-html-tagset"><ulink 
+                <para id="perl-html-tagset"><ulink
                 url="http://www.cpan.org/authors/id/S/SB/SBURKE/HTML-Tagset-&HTML-Tagset-version;.tar.gz">
                 HTML-Tagset-&HTML-Tagset-version;</ulink></para>
@@ -271,5 +271,5 @@
           </listitem>
           <listitem>
-            <para id="perl-compress-zlib"><ulink 
+            <para id="perl-compress-zlib"><ulink
             url="http://www.cpan.org/authors/id/P/PM/PMQS/Compress-Zlib-&Compress-Zlib-version;.tar.gz">
             Compress-Zlib-&Compress-Zlib-version;</ulink></para>
@@ -279,5 +279,5 @@
           </listitem>
           <listitem>
-            <para id="perl-crypt-ssleay"><ulink 
+            <para id="perl-crypt-ssleay"><ulink
             url="http://www.cpan.org/authors/id/C/CH/CHAMAS/Crypt-SSLeay-&Crypt-SSLeay-version;.tar.gz">
             Crypt-SSLeay-&Crypt-SSLeay-version;</ulink></para>
@@ -289,5 +289,5 @@
       </listitem>
       <listitem>
-        <para id="perl-datemanip"><ulink 
+        <para id="perl-datemanip"><ulink
         url="http://www.cpan.org/authors/id/S/SB/SBECK/DateManip-&DateManip-version;.tar.gz">
         DateManip-&DateManip-version;</ulink></para>
@@ -297,5 +297,5 @@
       </listitem>
       <listitem>
-        <para id="perl-finance-quote"><ulink 
+        <para id="perl-finance-quote"><ulink
         url="http://www.cpan.org/authors/id/P/PJ/PJF/Finance-Quote-&Finance-Quote-version;.tar.gz">
         Finance-Quote-&Finance-Quote-version;</ulink></para>
@@ -305,5 +305,5 @@
         <itemizedlist>
           <listitem>
-            <para id="perl-html-tableextract"><ulink 
+            <para id="perl-html-tableextract"><ulink
             url="http://www.cpan.org/authors/id/M/MS/MSISK/HTML-TableExtract-&HTML-TableExtract-version;.tar.gz">
             HTML-TableExtract-&HTML-TableExtract-version;</ulink></para>
@@ -332,5 +332,5 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>The modules listed below require modifications to the instructions in 
+    <para>The modules listed below require modifications to the instructions in
     order to install successfully.</para>
 
@@ -351,6 +351,6 @@
       <title>SGMLSpm-&SGMLSpm-version;</title>
 
-      <para>If your system's <application>Perl</application> version is different 
-      than &LFS-Perl-version;, you'll need to modify the <command>sed</command> 
+      <para>If your system's <application>Perl</application> version is different
+      than &LFS-Perl-version;, you'll need to modify the <command>sed</command>
       command below to reflect the version you have installed.</para>
 
@@ -372,18 +372,18 @@
   </sect2>
 
-  <sect2>
+  <sect2 role="installation">
     <title>(Alternate) Auto Installation of Perl Modules.</title>
 
-    <para>There is an alternate way of installing the modules using 
-    <application>Perl</application>'s built-in <command>install</command> command. 
-    The command automatically downloads the source from the CPAN 
-    archive, extracts it, runs the commands mentioned above, and removes the build 
-    tree. You may still need to install dependent library packages before running 
+    <para>There is an alternate way of installing the modules using
+    <application>Perl</application>'s built-in <command>install</command> command.
+    The command automatically downloads the source from the CPAN
+    archive, extracts it, runs the commands mentioned above, and removes the build
+    tree. You may still need to install dependent library packages before running
     the automated installation method.</para>
 
-    <para>The first time you run this command, you'll be prompted to enter some 
-    information regarding download locations and methods. This information is 
-    retained in files located in <filename class='directory'>~/.cpan</filename>. 
-    Start the perl shell with the following command as the 
+    <para>The first time you run this command, you'll be prompted to enter some
+    information regarding download locations and methods. This information is
+    retained in files located in <filename class='directory'>~/.cpan</filename>.
+    Start the perl shell with the following command as the
     <systemitem class="username">root</systemitem> user:</para>
 
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ general/sysutils/cpio.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Cpio</title>
 
@@ -60,5 +60,5 @@
     <title>Installation of Cpio</title>
 
-    <para>Install <application>cpio</application> by running the following 
+    <para>Install <application>cpio</application> by running the following
     commands:</para>
 
@@ -78,20 +78,20 @@
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c</command>: 
+    <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 
+    <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 
+    <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 
+    <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 
+    <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>
 
Index: gnome/add/system-tools-backends.xml
===================================================================
--- gnome/add/system-tools-backends.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ gnome/add/system-tools-backends.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -28,5 +28,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to system-tools-backends</title>
 
Index: gnome/core/eel.xml
===================================================================
--- gnome/core/eel.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ gnome/core/eel.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to EEL</title>
 
Index: gnome/core/gnome-terminal.xml
===================================================================
--- gnome/core/gnome-terminal.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ gnome/core/gnome-terminal.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to GNOME Terminal</title>
 
Index: gnome/otherlibs/gconf1.xml
===================================================================
--- gnome/otherlibs/gconf1.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ gnome/otherlibs/gconf1.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to GConf</title>
 
Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ kde/add/kdeartwork.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Kdeartwork</title>
 
@@ -58,6 +58,6 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>, 
-    <xref linkend="libxml2"/>, and 
+    <para><xref linkend="libjpeg"/>,
+    <xref linkend="libxml2"/>, and
     <xref linkend="libart_lgpl"/></para>
 
@@ -90,7 +90,7 @@
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
- 
+
       <seglistitem>
-        <seg>additional themes, screensavers, sounds, backgrounds, and 
+        <seg>additional themes, screensavers, sounds, backgrounds, and
         widget styles for <application>KDE</application></seg>
         <seg>None</seg>
@@ -99,5 +99,5 @@
       </seglistitem>
     </segmentedlist>
- 
+
     <indexterm zone="kdeartwork">
       <primary sortas="g-kdeartwork">KDE Artwork</primary>
Index: kde/add/kdegraphics.xml
===================================================================
--- kde/add/kdegraphics.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ kde/add/kdegraphics.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -51,5 +51,5 @@
       </listitem>
     </itemizedlist>
-    
+
     <bridgehead renderas="sect3">Kdegraphics Dependencies</bridgehead>
 
@@ -58,10 +58,10 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>, 
+    <para><xref linkend="libjpeg"/>,
     <xref linkend="libxml2"/>, and
     <xref linkend="libart_lgpl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="libtiff"/>, 
+    <para><xref linkend="libtiff"/>,
     <xref linkend="imlib"/>,
     <xref linkend="lcms"/>,
@@ -69,8 +69,8 @@
     <xref linkend="xpdf"/>,
     <xref linkend="tex"/>,
-    <ulink url="http://freedesktop.org/Software/FriBidi">FriBidi</ulink>, 
-    <ulink url="http://www.gphoto.org/">gPhoto2</ulink>, 
-    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">t1lib</ulink>, 
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and 
+    <ulink url="http://freedesktop.org/Software/FriBidi">FriBidi</ulink>,
+    <ulink url="http://www.gphoto.org/">gPhoto2</ulink>,
+    <ulink url="http://gd.tuwien.ac.at/visual/ibiblio/libs/graphics/t1lib-5.0.2.tar.gz">t1lib</ulink>,
+    <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
     <ulink url="http://packages.debian.org/unstable/source/libpaper">libpaper</ulink></para>
 
@@ -92,14 +92,14 @@
   </sect2>
 
-  <sect2>
+  <sect2 role="content">
     <title>Contents</title>
 
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle> 
-      <segtitle>Installed Directories</segtitle> 
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>kcoloredit, kdvi, kfax, kgamma, kghostview, kiconedit, kooka, kpaint, 
+        <seg>kcoloredit, kdvi, kfax, kgamma, kghostview, kiconedit, kooka, kpaint,
         kpdf, kpovmodeler, kruler, ksnapshot, kuickshow, and kview</seg>
         <seg>kio_kamera</seg>
@@ -107,5 +107,5 @@
       </seglistitem>
     </segmentedlist>
-     
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -196,5 +196,5 @@
         <term><command>kpovmodeler</command></term>
         <listitem>
-          <para>is a graphical 3D modeler, which can generate scenes for 
+          <para>is a graphical 3D modeler, which can generate scenes for
           <ulink url="http://www.povray.org/">POV-Ray</ulink>.</para>
           <indexterm zone="kdegraphics kpovmodeler">
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ kde/add/kdepim.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -12,5 +12,5 @@
   <!ENTITY kdepim-time          "22 SBU (additional 2.3 SBU for API docs)">
 
-  <!ENTITY gnu-org              "http://www.gnupg.org/download/index.html"> 
+  <!ENTITY gnu-org              "http://www.gnupg.org/download/index.html">
 ]>
 
@@ -29,5 +29,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Kdepim</title>
 
@@ -61,5 +61,5 @@
       </listitem>
     </itemizedlist>
-                                     
+
     <bridgehead renderas="sect3">Kdepim Dependencies</bridgehead>
 
@@ -68,23 +68,23 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para><xref linkend="libjpeg"/>, 
-    <xref linkend="libxml2"/>, 
-    <xref linkend="gnupg"/> and 
+    <para><xref linkend="libjpeg"/>,
+    <xref linkend="libxml2"/>,
+    <xref linkend="gnupg"/> and
     <xref linkend="openssl"/></para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para><xref linkend="pilot-link"/>, 
-    <ulink url="&gnu-org;#gpgme">GPGME-0.9.x</ulink> 
-    (requires <ulink url="&gnu-org;#libgpg-error">Libgpg-error</ulink> 
-    then <ulink url="&gnu-org;#libgcrypt">Libgcrypt</ulink> 
-    then <ulink url="&gnu-org;#libassuan">Libassuan</ulink> 
-    then <ulink url="&gnu-org;#libksba">Libksba</ulink>, 
-    <ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>, 
-    <ulink url="http://www.gnu-org/software/pth/">Pth</ulink>, 
-    <ulink url="http://www.opensc.org/">OpenSC</ulink> and then 
-    <ulink url="&gnu-org;#gnupg2">GnuPG-1.9.x</ulink>), 
-    <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>, 
-    <ulink url="http://www.gnokii.org/">gnokii</ulink>, 
-    Bluetooth hardware and driver libraries, 
+    <para><xref linkend="pilot-link"/>,
+    <ulink url="&gnu-org;#gpgme">GPGME-0.9.x</ulink>
+    (requires <ulink url="&gnu-org;#libgpg-error">Libgpg-error</ulink>
+    then <ulink url="&gnu-org;#libgcrypt">Libgcrypt</ulink>
+    then <ulink url="&gnu-org;#libassuan">Libassuan</ulink>
+    then <ulink url="&gnu-org;#libksba">Libksba</ulink>,
+    <ulink url="ftp://ftp.gnupg.org/gcrypt/pinentry/">pinentry</ulink>,
+    <ulink url="http://www.gnu-org/software/pth/">Pth</ulink>,
+    <ulink url="http://www.opensc.org/">OpenSC</ulink> and then
+    <ulink url="&gnu-org;#gnupg2">GnuPG-1.9.x</ulink>),
+    <ulink url="http://jasonday.home.att.net/code/libmal/libmal.html">libmal</ulink>,
+    <ulink url="http://www.gnokii.org/">gnokii</ulink>,
+    Bluetooth hardware and driver libraries,
     <ulink url="http://www.graphviz.org/">GraphViz</ulink>,
     and <xref linkend="doxygen"/></para>
@@ -102,11 +102,11 @@
 ./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make</userinput></screen> 
+make</userinput></screen>
 
     <note>
-      <para>If you wish to create the API documentation and 
-      you have <application>Doxygen</application> and 
-      <application>GraphViz</application> installed, 
-      <command>make apidox</command> must be done before 
+      <para>If you wish to create the API documentation and
+      you have <application>Doxygen</application> and
+      <application>GraphViz</application> installed,
+      <command>make apidox</command> must be done before
       <command>make install</command>.</para>
     </note>
@@ -125,7 +125,7 @@
       <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
- 
+
       <seglistitem>
-        <seg>kaddressbook, kalarm, kandy, karm, kgpgcertmanager, kmail, knode, 
+        <seg>kaddressbook, kalarm, kandy, karm, kgpgcertmanager, kmail, knode,
         knotes, konsolekalendar, kontact, korganizer, korn, and kpilot</seg>
         <seg>None</seg>
@@ -138,5 +138,5 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
-    
+
       <varlistentry id="kaddressbook">
         <term><command>kaddressbook</command></term>
@@ -222,5 +222,5 @@
         <term><command>konsolehelper</command></term>
         <listitem>
-          <para>is a command line interface to <application>KDE</application> 
+          <para>is a command line interface to <application>KDE</application>
           calendars.</para>
           <indexterm zone="kdepim konsolehelper">
@@ -233,5 +233,5 @@
         <term><command>kontact</command></term>
         <listitem>
-          <para>is the integrated solution to personal information management 
+          <para>is the integrated solution to personal information management
                 (PIM) needs.</para>
           <indexterm zone="kdepim kontact">
@@ -254,5 +254,5 @@
         <term><command>korn</command></term>
         <listitem>
-          <para>is a <application>KDE</application> mail checker that has the capabilities to 
+          <para>is a <application>KDE</application> mail checker that has the capabilities to
                 dock itself to <command>kicker</command>.</para>
           <indexterm zone="kdepim korn">
Index: pst/sgml/sgml-dtd-3.xml
===================================================================
--- pst/sgml/sgml-dtd-3.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ pst/sgml/sgml-dtd-3.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -28,5 +28,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to DocBook SGML DTD</title>
 
Index: pst/sgml/sgml-dtd.xml
===================================================================
--- pst/sgml/sgml-dtd.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ pst/sgml/sgml-dtd.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -28,5 +28,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to DocBook SGML DTD</title>
 
Index: server/major/samba3.xml
===================================================================
--- server/major/samba3.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ server/major/samba3.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Samba</title>
 
Index: server/major/vsftpd.xml
===================================================================
--- server/major/vsftpd.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ server/major/vsftpd.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to vsFTPD</title>
 
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ x/lib/pango.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Pango</title>
 
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ x/lib/qt.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to Qt</title>
 
Index: x/wm/sawfish.xml
===================================================================
--- x/wm/sawfish.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ x/wm/sawfish.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to sawfish</title>
 
Index: xsoft/suites/koffice.xml
===================================================================
--- xsoft/suites/koffice.xml	(revision 56ab82c03b08f04b3a903360d56dde767c25176f)
+++ xsoft/suites/koffice.xml	(revision 4e82a1899f656413c9cbb1b18d3b0606bdf21360)
@@ -27,5 +27,5 @@
   </indexterm>
 
-  <sect2>
+  <sect2 role="package">
     <title>Introduction to KOffice</title>
 
