Index: kde/add/kdeartwork.xml
===================================================================
--- kde/add/kdeartwork.xml	(revision 3ba3f589fd3284a31983593d547a2d98c8c5e146)
+++ 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 3ba3f589fd3284a31983593d547a2d98c8c5e146)
+++ 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 3ba3f589fd3284a31983593d547a2d98c8c5e146)
+++ 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">
