Index: kde/core/kdebase.xml
===================================================================
--- kde/core/kdebase.xml	(revision 5f0bab7177c98ca2fd8ffe4a91e0d148a4a1a1ed)
+++ kde/core/kdebase.xml	(revision 1f30212d806b5a7305de85ab35ed3dd0da9b846d)
@@ -7,112 +7,114 @@
 <!ENTITY kdebase-download-http "&kde-download-http;/kdebase-&kde-version;.tar.bz2">
 <!ENTITY kdebase-download-ftp  "&kde-download-ftp;/kdebase-&kde-version;.tar.bz2">
-<!ENTITY kdebase-md5sum        "edbd721a2a4970977dfe5f45d9e38923">
-<!ENTITY kdebase-size          "19.9 MB">
-<!ENTITY kdebase-buildsize     "269 MB (additional 20 MB for API docs)">
-<!ENTITY kdebase-time          "21.15 SBU (additional 0.24 SBU for API docs)">
+<!ENTITY kdebase-md5sum        "c88659e558ca98dc45377bf8ddfc26c9">
+<!ENTITY kdebase-size          "21.6 MB">
+<!ENTITY kdebase-buildsize     "282 MB (additional 20 MB for API docs)">
+<!ENTITY kdebase-time          "21.15 SBU (additional 0.2 SBU for API docs)">
 ]>
 
 <sect1 id="kdebase" xreflabel="kdebase-&kde-version;">
+<?dbhtml filename="kdebase.html"?>
+
 <sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
+  <othername>$LastChangedBy$</othername>
+  <date>$Date$</date>
 </sect1info>
-<?dbhtml filename="kdebase.html"?>
+
 <title>kdebase-&kde-version;</title>
+
 <indexterm zone="kdebase">
   <primary sortas="a-kdebase">Kdebase</primary>
 </indexterm>
 
-<sect2>
-<title>Introduction to <application>kdebase</application></title>
-
-<para><application>kdebase</application> is the last mandatory package 
-required for the K Desktop Environment. It provides various applications, 
-infrastructure files and libraries.</para>
-
-<sect3><title>Package information</title>
+<sect2 role="package">
+<title>Introduction to kdebase</title>
+
+<para><application>kdebase</application> is the last mandatory package required
+for the K Desktop Environment. It provides various applications, infrastructure
+files and libraries.</para>
+
+<bridgehead renderas="sect3">Package Information</bridgehead>
 <itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&kdebase-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&kdebase-download-ftp;"/></para></listitem>
-<listitem><para>Download MD5 sum: &kdebase-md5sum;</para></listitem>
-<listitem><para>Download size: &kdebase-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&kdebase-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&kdebase-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required patch: <ulink 
-url="ftp://ftp.kde.org/pub/kde/security_patches/post-3.3.2-kdebase-htmlframes2.patch"/></para>
-</listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application>kdebase</application> dependencies</title>
-
-<sect4><title>Required</title>
+  <listitem>
+    <para>Download (HTTP): <ulink url="&kdebase-download-http;"/></para>
+  </listitem>
+  <listitem>
+    <para>Download (FTP): <ulink url="&kdebase-download-ftp;"/></para>
+  </listitem>
+  <listitem>
+    <para>Download MD5 sum: &kdebase-md5sum;</para>
+  </listitem>
+  <listitem>
+    <para>Download size: &kdebase-size;</para>
+  </listitem>
+  <listitem>
+    <para>Estimated disk space required: &kdebase-buildsize;</para>
+  </listitem>
+  <listitem>
+    <para>Estimated build time: &kdebase-time;</para>
+  </listitem>
+</itemizedlist>
+
+
+<bridgehead renderas="sect3">kdebase Dependencies</bridgehead>
+
+<bridgehead renderas="sect4">Required</bridgehead>
 <para><xref linkend="kdelibs"/></para>
-</sect4>
-
-<sect4><title>Recommended</title>
+
+<bridgehead renderas="sect4">Recommended</bridgehead>
 <para><xref linkend="libjpeg"/>, 
-<xref linkend="libart_lgpl"/>, 
-<xref linkend="libxml2"/>, 
-<xref linkend="openssl"/> and 
-<xref linkend="jdk"/></para>
-</sect4>
-
-<sect4><title>Optional</title>
+      <xref linkend="libart_lgpl"/>, 
+      <xref linkend="libxml2"/>, 
+      <xref linkend="openssl"/>, and 
+      <xref linkend="jdk"/>
+</para>
+
+<bridgehead renderas="sect4">Optional</bridgehead>
 <para><xref linkend="libtiff"/>, 
-<xref linkend="lesstif"/>, 
-<xref linkend="Linux_PAM"/>, 
-<xref linkend="openldap"/>, 
-<xref linkend="cyrus-sasl"/>, 
-<xref linkend="samba3"/>, 
-<xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
-<ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, 
-<ulink url="http://mtools.linux.lu/?power-to-the-parliament">Mtools</ulink>, 
-<ulink url="http://www.linux1394.org/">libraw1394</ulink>, 
-<ulink url="http://secure.netroedge.com/~lm78/">lm_sensors</ulink>, 
-<ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>, 
-<ulink url="http://www.graphviz.org/">GraphViz</ulink> 
-and <xref linkend="doxygen"/></para>
-</sect4>
-
-</sect3>
+      <xref linkend="lesstif"/>, 
+      <xref linkend="Linux_PAM"/>, 
+      <xref linkend="openldap"/>, 
+      <xref linkend="cyrus-sasl"/>, 
+      <xref linkend="samba3"/>, 
+      <xref linkend="heimdal"/> or <xref linkend="mitkrb"/>, 
+      <ulink url="http://www.pdc.kth.se/kth-krb/">krb4</ulink>, 
+      <ulink url="http://mtools.linux.lu/?power-to-the-parliament">Mtools</ulink>, 
+      <ulink url="http://www.linux1394.org/">libraw1394</ulink>, 
+      <ulink url="http://secure.netroedge.com/~lm78/">lm_sensors</ulink>, 
+      <ulink url="http://www.ece.uvic.ca/~mdadams/jasper/">JasPer</ulink>, 
+      <ulink url="http://www.graphviz.org/">GraphViz</ulink>, and 
+      <xref linkend="doxygen"/>
+</para>
 
 </sect2>
 
-<sect2>
-<title>Installation of <application>kdebase</application></title>
-
-<para><emphasis>Note:</emphasis> You should ensure a <quote>nogroup</quote> 
-group exists on your system before performing the 
-<command>make install</command> command, as <application>kdebase</application> 
-installs a program (<filename>$KDE_PREFIX/bin/kdesud</filename>) with group 
-ownership of <quote>nogroup</quote>.</para>
+<sect2 role="installation">
+<title>Installation of kdebase</title>
+
+<para><emphasis>Note:</emphasis> You should ensure a <systemitem
+class="groupname">nogroup</systemitem> group exists on your system before
+performing the <command>make install</command> command, as
+<application>kdebase</application> installs a program
+(<filename>$KDE_PREFIX/bin/kdesud</filename>) with group ownership of
+<systemitem class="groupname">nogroup</systemitem>.</para>
 
 <para>Install <application>kdebase</application> with:</para>
 
-<screen><userinput><command>patch -Np0 -i ../post-3.3.2-kdebase-htmlframes2.patch &amp;&amp;
-./configure --prefix=&kde-dir; --disable-debug \
+<screen><userinput>./configure --prefix=&kde-dir; --disable-debug \
     --disable-dependency-tracking &amp;&amp;
-make</command></userinput></screen> 
-
-<note><para>If you wish to create the <acronym>API</acronym> documentation and 
+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 <command>make install</command>.</para></note>
 
-<para>Now, as the root user:</para>
+<para>Now, as the <systemitem class="username">root</systemitem> user:</para>
  
-<screen><userinput role='root'><command>make install</command></userinput></screen>
+<screen role='root'><userinput>make install</userinput></screen>
 
 </sect2>
 
-<sect2>
+<sect2 role="content">
 <title>Contents</title>
 
@@ -123,5 +125,6 @@
     <seg>kate, kcontrol, kdebugdialog, kdeprint, kdesu, kdm, kfind,
          khelpcenter, kicker, kinfocenter, kioslave, klipper, kmenuedit
-         konqueror, konsole, kpager, ksplashml, ksysguard, kwrite, kxkb</seg>
+         konqueror, konsole, kpager, ksplashml, ksysguard, kwrite, 
+         and kxkb</seg>
   </seglistitem>
 </segmentedlist>
@@ -130,9 +133,10 @@
   <bridgehead renderas="sect3">Short Descriptions</bridgehead>
   <?dbfo list-presentation="list"?>
+  <?dbhtml list-presentation="table"?>
  
 <varlistentry id="kate">
   <term><command>kate</command></term>
   <listitem>
-    <para> is a programmer's text editor for <acronym>KDE</acronym>.</para>
+    <para> is a programmer's text editor for KDE.</para>
     <indexterm zone="kdebase kate">
       <primary sortas="b-kate">kate</primary>
@@ -144,5 +148,5 @@
   <term><command>kcontrol</command></term>
   <listitem>
-    <para> is the <acronym>KDE</acronym> Control Center.</para>
+    <para> is the KDE Control Center.</para>
     <indexterm zone="kdebase kcontrol">
       <primary sortas="b-kcontrol">kcontrol</primary>
@@ -176,5 +180,6 @@
   <term><command>kdesu</command></term>
   <listitem>
-    <para>is a graphical front end for the Unix <command>su</command> command.</para>
+    <para>is a graphical front end for the Unix 
+      <command>su</command> command.</para>
     <indexterm zone="kdebase kdesu">
       <primary sortas="b-kdesu">kdesu</primary>
@@ -186,5 +191,6 @@
   <term><command>kdm</command></term>
   <listitem>
-    <para>is the <acronym>KDE</acronym> display manager (a replacement for <command>xdm</command>).</para>
+    <para>is the KDE display manager (a replacement 
+      for <command>xdm</command>).</para>
     <indexterm zone="kdebase kdm">
       <primary sortas="b-kdm">kdm</primary>
@@ -206,5 +212,5 @@
   <term><command>khelpcenter</command></term>
   <listitem>
-    <para>is the <acronym>KDE</acronym> help tool.</para>
+    <para>is the KDE help tool.</para>
     <indexterm zone="kdebase khelpcenter">
        <primary sortas="b-khelpcenter">khelpcenter</primary>
@@ -216,5 +222,5 @@
   <term><command>kicker</command></term>
   <listitem>
-    <para>is the <acronym>KDE</acronym> control panel.</para>
+    <para>is the KDE control panel.</para>
     <indexterm zone="kdebase kicker">
       <primary sortas="b-kicker">kicker</primary>
@@ -227,5 +233,5 @@
   <listitem>
     <para>provides a centralized and convenient 
-          overview of your <acronym>KDE</acronym> and system settings.</para>
+          overview of your KDE and system settings.</para>
     <indexterm zone="kdebase kinfocenter">
       <primary sortas="b-kinfocenter">kinfocenter</primary>
@@ -300,5 +306,6 @@
   <term><command>ksplashml</command></term>
   <listitem>
-    <para>is a splash screen that shows the progress of an application that is loading.</para>
+    <para>is a splash screen that shows the progress of an application 
+      that is loading.</para>
     <indexterm zone="kdebase ksplashml">
       <primary sortas="b-ksplashml">ksplashml</primary>
@@ -321,5 +328,5 @@
   <term><command>kwrite</command></term>
   <listitem>
-    <para>is a text editor for <acronym>KDE</acronym>.</para>
+    <para>is a text editor for KDE </para>
     <indexterm zone="kdebase kwrite">
       <primary sortas="b-kwrite">kwrite</primary>
@@ -331,5 +338,6 @@
   <term><command>kxkb</command></term>
   <listitem>
-    <para>is a keyboard layout switching utility based on the X11 xkb extension.</para>
+    <para>is a keyboard layout switching utility based on the X11 xkb 
+      extension.</para>
     <indexterm zone="kdebase kxkb">
       <primary sortas="b-kxkb">kxkb</primary>
@@ -341,4 +349,3 @@
 
 </sect2>
-
 </sect1>
