Index: general.ent
===================================================================
--- general.ent	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ general.ent	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -10,5 +10,5 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 23rd, &year;">
+<!ENTITY releasedate  "March 24th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
@@ -688,18 +688,6 @@
 <!ENTITY kde4plasma-addons-version    "4.8.1">
 <!ENTITY libkexiv2-version            "4.8.1">
-<!ENTITY kde4pim-version              "4.4.10">
-<!ENTITY kde4games-version            "4.6.0">
-<!ENTITY kde4edu-version              "4.6.0">
-<!ENTITY kde4accessibility-version    "4.6.0">
-<!ENTITY kde4toys-version             "4.6.0">
-<!ENTITY kde4-download-http-pim       "http://mirrors.isc.org/pub/kde/&kde4-branch;/kdepim-&kde4pim-version;/src">
-<!ENTITY kde4-download-ftp-pim        "ftp://ftp.kde.org/pub/kde/&kde4-branch;/kdepim-&kde4pim-version;/src">
-<!ENTITY kde4sdk-version              "4.6.0">
-<!ENTITY kde4webdev-version           "4.6.0">
-<!ENTITY kdevplatform-version         "1.2.0">
-<!ENTITY kdevelop4-version            "4.2.0">
-<!ENTITY kdevelop4-php-version        "&kdevplatform-version;">
-<!ENTITY kdevel4-download-http        "http://mirrors.isc.org/pub/kde/&kde4-branch;/kdevelop/&kdevelop4-version;/src">
-<!ENTITY kdevel4-download-ftp         "ftp://ftp.kde.org/pub/kde/&kde4-branch;/kdevelop/&kdevelop4-version;/src">
+<!ENTITY kde4pim-version              "4.8.1">
+<!ENTITY kde4pimruntime-version       "4.8.1">
 
 <!-- Part IX -->
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ introduction/welcome/changelog.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -45,4 +45,22 @@
       <para>March 24th, 2012</para>
       <itemizedlist>
+	<listitem>
+          <para>[rthomsen] - Added information about further KDE4 packages.</para>
+	</listitem>
+        <listitem>
+          <para>[rthomsen] - Removed kdesdk, kdewebdev, kdevplatform and kdevelop.</para>
+	</listitem>
+        <listitem>
+          <para>[rthomsen] - Removed kdetoys, kdegames, kdeedu and kdeaccessibility.</para>
+        </listitem>	
+         <listitem>
+          <para>[rthomsen] - Added instructions for starting KDE4.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Kdepim-runtime 4.8.1.</para>
+        </listitem>
+	<listitem>
+          <para>[rthomsen] - Kdepim 4.8.1.</para>
+        </listitem>
         <listitem>
           <para>[krejzi] - freetype 2.4.9.</para>
Index: kde4/add/add-pkgs.xml
===================================================================
--- kde4/add/add-pkgs.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
+++ kde4/add/add-pkgs.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="kde4-add-pkgs" xreflabel="Further KDE4 packages">
+  <?dbhtml filename="add-pkgs.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Further KDE4 packages</title>
+  
+  <para>This section did not provide instructions for all of the available 
+  packages in the KDE4 Software Compilation. The included packages were selected 
+  based on what most people would want to use on a standard desktop computer.</para>
+  <para>For a full list of available packages, have a look on the KDE servers 
+  (<ulink url="&kde4-download-http;&kde4-version;/src/">http</ulink> 
+  or <ulink url="&kde4-download-ftp;&kde4-version;/src/">ftp</ulink>).</para>
+  
+  <para>Some additional packages worth mentioning are:</para>
+  
+      <itemizedlist>
+         <listitem>
+          <para>Kdegames: Collection of desktop games.</para>
+        </listitem>
+        <listitem>
+          <para>Kaccessible: Accessibility utilities.</para>
+        </listitem>
+	<listitem>
+          <para>Kdetoys: Collection of desktop toys.</para>
+        </listitem>
+	<listitem>
+          <para>Kwallet: Credentials management application.</para>
+        </listitem>
+        <listitem>
+          <para>Marble: Map program.</para>
+        </listitem>
+        <listitem>
+          <para>Kdesdk: Tools for developers.</para>
+        </listitem>
+      </itemizedlist>
+      
+      <para>Most of these packages can be built with the standard KDE4 instructions:</para>
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
+      -DKDE_DEFAULT_HOME=.kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      .. &amp;&amp;
+make</userinput></screen>
+<para>And as the <systemitem class="username">root</systemitem> user:</para>
+<screen role="root"><userinput>make install</userinput></screen>
+	
+</sect1>
Index: kde4/add/add.xml
===================================================================
--- kde4/add/add.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ kde4/add/add.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -25,10 +25,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4pimruntime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4multimedia.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4games.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4artwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4edu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4plasmaaddons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4accessibility.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4toys.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add-pkgs.xml"/>
 </chapter>
Index: e4/add/kde4accessibility.xml
===================================================================
--- kde4/add/kde4accessibility.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kde4accessibility-download-http "&kde4-download-http;&kde4accessibility-version;/src/kdeaccessibility-&kde4accessibility-version;.tar.bz2">
-  <!ENTITY kde4accessibility-download-ftp  "&kde4-download-ftp;&kde4accessibility-version;/src/kdeaccessibility-&kde4accessibility-version;.tar.bz2">
-  <!ENTITY kde4accessibility-md5sum        "95bfb46141365d7330adfacd952584e9">
-  <!ENTITY kde4accessibility-size          "1.9 MB">
-  <!ENTITY kde4accessibility-buildsize     "34 MB">
-  <!ENTITY kde4accessibility-time          "0.7 SBU">
-]>
-
-<sect1 id="kde4accessibility" xreflabel="kdeaccessibility-&kde4accessibility-version;">
-  <?dbhtml filename="kde4accessibility.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdeaccessibility-&kde4accessibility-version;</title>
-
-  <indexterm zone="kde4accessibility">
-    <primary sortas="a-kde4accessibility">kde4accessibility</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeaccessibility</title>
-
-    <para>This package provides tools for users with physical handicaps to use
-    <application>KDE4</application>.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde4accessibility-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde4accessibility-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde4accessibility-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde4accessibility-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde4accessibility-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde4accessibility-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4accessibility-&kdeaccessibility-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdeaccessibility Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="python2"/>, 
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    Speech, opentts
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde4accessibility"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeaccessibility</title>
-
-    <para>Install <application>Kdeaccessibility</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>kmag, kmousetool, kmouth</seg>
-        <seg></seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4accessibility">
-        <term><command>kde4accessibility</command></term>
-        <listitem>
-          <para>is a testing utility for kde4accessibility-generated build trees.</para>
-          <indexterm zone="a-kde4accessibility kde4accessibility">
-            <primary sortas="b-kde4accessibility">kdeaccessibility</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: e4/add/kde4edu.xml
===================================================================
--- kde4/add/kde4edu.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kde4edu-download-http "&kde4-download-http;&kde4edu-version;/src/kdeedu-&kde4edu-version;.tar.bz2">
-  <!ENTITY kde4edu-download-ftp  "&kde4-download-ftp;&kde4edu-version;/src/kdeedu-&kde4edu-version;.tar.bz2">
-  <!ENTITY kde4edu-md5sum        "910301da580fb30c2d7fbb5b22b9a08c">
-  <!ENTITY kde4edu-size          "68 MB">
-  <!ENTITY kde4edu-buildsize     "936 MB">
-  <!ENTITY kde4edu-time          "14.8 SBU">
-]>
-
-<sect1 id="kde4edu" xreflabel="kdeedu-&kde4edu-version;">
-  <?dbhtml filename="kde4edu.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdeedu-&kde4edu-version;</title>
-
-  <indexterm zone="kde4edu">
-    <primary sortas="a-kde4edu">kde4edu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdeedu</title>
-
-    <para>This package provides ...</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde4edu-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde4edu-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde4edu-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde4edu-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde4edu-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde4edu-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4edu-&kdeedu-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdeedu Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    perl, phonon, kdepimlibs jpeg, soprano , qca, strigi, gpgme, boost
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="attica"/>, 
-    <xref linkend="libxml2"/>, 
-    <xref linkend="libxslt"/>, 
-    libgps, Eigen2,
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    R, libspectre, libcfitsio0, libindi, XPlanet, OCaml LibFacile, OpenBabel2,
-    Avogadro, Qalculate, GSL, pyMarble-binding
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde4edu"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeedu</title>
-
-    <para>Install <application>kde4edu</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DDISABLE_VIDEOSUPPORT=ON</option>: Set this option in case you didn't
-    have <ulink url="http://hansdegoede.livejournal.com/3636.html">libv4l</ulink> installed.</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>blinken, calgebra, cantor, geodatatest, kalgebra, kalgebramobile,
-        kalzium, kanagram, kbruch, kgeography, khangman, kig, kiten, kitengen,
-        kitenradselect, klettres, kmplot, kstars, ktouch, kturtle, kwordquiz,
-        marble, parley, pykig.py, rocs, routing-instructions, step,
-        tilecreator</seg>
-        <seg>libanalitzagui.so, libanalitza.so, libcantorlibs.so,
-        libkdeeduui.so, libkeduvocdocument.so, libkiten.so, libmarblewidget.so,
-        librocslib.so, libSatLib.so, libscience.so</seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4edu">
-        <term><command>kde4edu</command></term>
-        <listitem>
-          <para>is a testing utility for kde4edu-generated build trees.</para>
-          <indexterm zone="a-kde4edu kde4edu">
-            <primary sortas="b-kde4edu">kdeedu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: e4/add/kde4games.xml
===================================================================
--- kde4/add/kde4games.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,167 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kde4games-download-http "&kde4-download-http;&kde4games-version;/src/kdegames-&kde4games-version;.tar.bz2">
-  <!ENTITY kde4games-download-ftp  "&kde4-download-ftp;&kde4games-version;/src/kdegames-&kde4games-version;.tar.bz2">
-  <!ENTITY kde4games-md5sum        "131260cb75a7590910b8b84f18e6b35e">
-  <!ENTITY kde4games-size          "58 MB">
-  <!ENTITY kde4games-buildsize     "521 MB">
-  <!ENTITY kde4games-time          "8.3 SBU">
-]>
-
-<sect1 id="kde4games" xreflabel="kdegames-&kde4games-version;">
-  <?dbhtml filename="kde4games.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdegames-&kde4games-version;</title>
-
-  <indexterm zone="kde4games">
-    <primary sortas="a-kde4games">kde4games</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdegames</title>
-
-    <para>This package provides a lot of funny stuff and games.</para> 
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde4games-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde4games-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde4games-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde4games-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde4games-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde4games-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4games-&kdeutils-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdegames Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="phonon"/>,
-    <xref linkend="qca"/>
-    <!--<xref linkend="kde4bindings"/> (pyQT4, pyKDE4)-->
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="libarchive"/>, 
-    OpenAL, qvoronoi, Twisted
-    GGZ, 
-
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde4games"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdegames</title>
-
-    <para>Install <application>Kdegames</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>bomber, bovo, granatier, kapman, katomic, kbattleship, kblackbox,
-        kblocks, kbounce, kbreakout, kdesnake, kdiamond, kfourinline,
-        kfourinlineproc, kgoldrunner, kigo, killbots, kiriki, kjumpingcube,
-        klickety, klines, kmahjongg, kmines, knetwalk, kolf, kollision,
-        konquest, kpat, kreversi, kshisen, ksirk, ksirkskineditor, kspaceduel,
-        ksquares, ksudoku, ktron, ktuberling, kubrick, libpala-puzzlebuilder,
-        lskat, palapeli</seg>
-        <seg>libiris_ksirk.so, libkcardgame.so, libkdegames.so,
-        libkggzgames.so, libkggzmod.so, libkggznet.so, libkmahjongglib.so,
-        libkolfprivate.so, libpala.so</seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4games">
-        <term><command>kde4games</command></term>
-        <listitem>
-          <para>is a testing utility for kde4games-generated build trees.</para>
-          <indexterm zone="a-kde4games kde4games">
-            <primary sortas="b-kde4games">kdeutils</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: kde4/add/kde4pim.xml
===================================================================
--- kde4/add/kde4pim.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ kde4/add/kde4pim.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kde4pim-download-http "&kde4-download-http-pim;/kdepim-&kde4pim-version;.tar.bz2">
-  <!ENTITY kde4pim-download-ftp  "&kde4-download-ftp-pim;/kdepim-&kde4pim-version;.tar.bz2">
-  <!ENTITY kde4pim-md5sum        "c32690ed08a3eeb7010a2a0eefbf6f4c">
-  <!ENTITY kde4pim-size          "9 MB">
-  <!ENTITY kde4pim-buildsize     "1.1 GB">
-  <!ENTITY kde4pim-time          "14.2 SBU">
+  <!ENTITY kde4pim-download-http "&kde4-download-http;&kde4pim-version;/src/kdepim-&kde4pim-version;.tar.xz">
+  <!ENTITY kde4pim-download-ftp  "&kde4-download-ftp;&kde4pim-version;/src/kdepim-&kde4pim-version;.tar.xz">
+  <!ENTITY kde4pim-md5sum        "b6437783b3d7aa06701a5c3280164a68">
+  <!ENTITY kde4pim-size          "13.3 MB">
+  <!ENTITY kde4pim-buildsize     "1.3 GB">
+  <!ENTITY kde4pim-time          "19.2 SBU">
 ]>
 
-<sect1 id="kde4pim" xreflabel="kde4pim-&kde4pim-version;">
+<sect1 id="kde4pim" xreflabel="kdepim-&kde4pim-version;">
   <?dbhtml filename="kde4pim.html"?>
 
@@ -35,5 +35,5 @@
     and sticky notes.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -72,17 +72,19 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python2"/>, 
     <xref linkend="kde4pimlibs"/>
-    <!-- libffi gobject-introspection pycairo pygobject pygtk pycups desktop-file-utils system-config-printer -->
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="libassuan"/>, gpgme, onto, strigi
+    <xref linkend="boost"/> and
+    <xref linkend="libassuan"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    indicate-qt
+    <xref linkend="cyrus-sasl"/>,
+    <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>,
+    <ulink url="http://www.gitorious.org/grantlee/pages/Home">Grantlee</ulink> and
+    <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink>
     </para>
 
@@ -96,16 +98,13 @@
     <title>Installation of Kdepim</title>
 
-    <para>Install <application>kde4pim</application> by running
+    <para>Install <application>Kdepim</application> by running
     the following commands:</para>
 
 <screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
+      -DKDE_DEFAULT_HOME=.kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      .. &amp;&amp;
 make</userinput></screen>
 
@@ -129,26 +128,15 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>akonadiconsole, akregator, akregatorstorageexporter, blogilo, 
-        groupwarewizard, groupwisewizard, ical2vcal, kabc2mutt, kabcclient, 
-        kaddressbook, kalarm, kalarmautostart, karm, kgpgconf, kjots,
-        kleopatra, kmail, kmail_antivir.sh, kmail_clamav.sh, kmailcvt,
-        kmail_fprot.sh, kmail_sav.sh, knode, knotes, kolabwizard, 
-        konsolekalendar, kontact, korgac, korganizer, ksendemail,
-        ktimetracker, kwatchgnupg, sloxwizard</seg>
-        <seg>libakonadi-kcal_next.so, libakonadi_next.so, libakregatorinterfaces.so,
-        libgwsoap.so, libkabc_groupdav.so, libkabcgroupwise.so, libkabckolab.so, 
-        libkabc_slox.so, libkalarm_calendar.so, libkalarm_resources.so, 
-        libkcal_groupdav.so, libkcalgroupwise.so, libkcalkolab.so, 
-        libkcal_resourceblog.so, libkcal_resourceremote.so, libkcal_slox.so, 
-        libkdepim.so, libkgroupwarebase.so, libkgroupwaredav.so, libkleo.so,
-        libknodecommon.so, libknoteskolab.so, libkorganizer_calendar.so,
-        libkorganizer_core.so, libkorganizer_eventviewer.so, libkorganizer_interfaces.so,
-        libkorg_stdprinting.so, libkpgp.so, libksieve.so, libkslox.so,
-        libmessagecore.so, libmessagelist.so, libmessageviewer.so,
-        libmimelib.so</seg>
-        <seg>$KDE4_PREFIX/lib/akonadi/contact/editorpageplugins</seg>
+        <seg>akonadi_mailfilter_agent, akonadiconsole, akregator, akregatorstorageexporter, blogilo, 
+        ical2vcal, kabc2mutt, kabcclient, 
+        kaddressbook, kaddressbook-mobile, kalarm, kalarmautostart, karm, kgpgconf, kincidenceeditor, kjots,
+        kleopatra, kmail, kmail_mobile, kmail_antivir.sh, kmail_clamav.sh, kmail_fprot.sh, kmail_sav.sh, kmailcvt,
+        knode, knotes, konsolekalendar, kontact, korgac, korganizer, korganizer-mobile, ksendemail,
+        ktimetracker, kwatchgnupg, notes-mobile and tasks-mobile</seg>
+	<seg>numerous in $KDE4_PREFIX/lib</seg>
+        <seg></seg>
       </seglistitem>
     </segmentedlist>
Index: kde4/add/kde4pimruntime.xml
===================================================================
--- kde4/add/kde4pimruntime.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ kde4/add/kde4pimruntime.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY kde4pim-runtime-download-http "&kde4-download-http-pim;/kdepim-runtime-&kde4pim-version;.tar.bz2">
-  <!ENTITY kde4pim-runtime-download-ftp  "&kde4-download-ftp-pim;/kdepim-runtime-&kde4pim-version;.tar.bz2">
-  <!ENTITY kde4pim-runtime-md5sum        "be762d22a1391960a2770b590fb220b1">
-  <!ENTITY kde4pim-runtime-size          "600 KB">
-  <!ENTITY kde4pim-runtime-buildsize     "211 MB">
-  <!ENTITY kde4pim-runtime-time          "3.5 SBU">
+  <!ENTITY kde4pim-runtime-download-http "&kde4-download-http;&kde4pimruntime-version;/src/kdepim-runtime-&kde4pimruntime-version;.tar.xz">
+  <!ENTITY kde4pim-runtime-download-ftp  "&kde4-download-ftp;&kde4pimruntime-version;/src/kdepim-runtime-&kde4pimruntime-version;.tar.xz">
+  <!ENTITY kde4pim-runtime-md5sum        "9c26ea08d3c937313e931070c902bfb6">
+  <!ENTITY kde4pim-runtime-size          "1.1 MB">
+  <!ENTITY kde4pim-runtime-buildsize     "400 MB">
+  <!ENTITY kde4pim-runtime-time          "7.2 SBU">
 ]>
 
-<sect1 id="kde4pimruntime" xreflabel="kde4pim-runtime-&kde4pim-version;">
+<sect1 id="kde4pimruntime" xreflabel="kdepim-runtime-&kde4pimruntime-version;">
   <?dbhtml filename="kde4pimruntime.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kdepim-runtime-&kde4pim-version;</title>
+  <title>Kdepim-runtime-&kde4pimruntime-version;</title>
 
   <indexterm zone="kde4pimruntime">
@@ -28,9 +28,10 @@
 
   <sect2 role="package">
-    <title>Introduction to Kdepim-Runtime</title>
+    <title>Introduction to Kdepim-runtime</title>
 
-    <para>This package provides ...</para>
+    <para>This package provides additional resources for <application>Akonadi</application>.
+    </para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -69,16 +70,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="python2"/>, 
     <xref linkend="kde4pimlibs"/>
-    <!-- libffi gobject-introspection pycairo pygobject pygtk pycups desktop-file-utils system-config-printer -->
+    </para>
+<!--
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="libxslt"/>, 
-    <xref linkend="libxml2"/>, 
-    gpgme, onto, strigi
-    </para>
-<!--
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -94,16 +90,13 @@
     <title>Installation of Kdepim-runtime</title>
 
-    <para>Install <application>kde4pim-runtime</application> by running
+    <para>Install <application>Kdepim-runtime</application> by running
     the following commands:</para>
 
 <screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
+      -DKDE_DEFAULT_HOME=.kde4 \
+      -DSYSCONF_INSTALL_DIR=/etc/kde4 \
+      .. &amp;&amp;
 make</userinput></screen>
 
@@ -127,20 +120,12 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>akonadi2xml, akonadi_birthdays_resource, akonadi_contacts_resource,
-        akonadi_ical_resource, akonadi_imap_resource, akonadi_kabc_resource, 
-        akonadi_kcal_resource, akonadi_knut_resource,
-        akonadi_kolabproxy_resource, akonadi_localbookmarks_resource, 
-        akonadi_maildir_resource, akonadi_maildispatcher_agent, 
-        akonadi_mailtransport_dummy_resource, akonadi_mbox_resource, 
-        akonadi_microblog_resource, akonadi_nepomuk_calendar_feeder,
-        akonadi_nepomuk_contact_feeder, akonadi_nepomuktag_resource, 
-        akonadi_nntp_resource, akonadi_notes_resource, akonadi_pop3_resource,
-        akonaditray, akonadi_vcarddir_resource, akonadi_vcard_resource, 
-        kaddressbookmigrator, kmail-migrator, kres-migrator</seg>
-        <seg>libakonadi-xml.so, libkdepim-copy.so, libmaildir.so, 
-        libmbox.so</seg>
+        <seg>accountwizard, akonadi2xml, akonadi_*, akonaditray, 
+        kaddressbookmigrator, kjotsmigrator, kmail-migrator and kres-migrator</seg>
+        <seg>libakonadi-filestore.so, libakonadi-xml.so, libkdepim-copy.so, 
+	libkmindexreader.so, libmaildir.so, libnepomukdatamanagement-copy.so and 
+	libnepomukfeederpluginlib.a</seg>
         <seg></seg>
       </seglistitem>
Index: e4/add/kde4toys.xml
===================================================================
--- kde4/add/kde4toys.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kde4toys-download-http "&kde4-download-http;&kde4toys-version;/src/kdetoys-&kde4toys-version;.tar.bz2">
-  <!ENTITY kde4toys-download-ftp  "&kde4-download-ftp;&kde4toys-version;/src/kdetoys-&kde4toys-version;.tar.bz2">
-  <!ENTITY kde4toys-md5sum        "2025e1931ada4d1b1d37371df9847865">
-  <!ENTITY kde4toys-size          "400 KB">
-  <!ENTITY kde4toys-buildsize     "15 MB">
-  <!ENTITY kde4toys-time          "0.3 SBU">
-]>
-
-<sect1 id="kde4toys" xreflabel="kdetoys-&kde4toys-version;">
-  <?dbhtml filename="kde4toys.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdetoys-&kde4toys-version;</title>
-
-  <indexterm zone="kde4toys">
-    <primary sortas="a-kde4toys">kde4toys</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdetoys</title>
-
-    <para>This package provides some funny stuff.</para>
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde4toys-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde4toys-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde4toys-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde4toys-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde4toys-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde4toys-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4toys-&kdetoys-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdetoys Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="attica"/>, 
-    <xref linkend="libxml2"/>, 
-    <xref linkend="libxslt"/>, 
-    libgps, Eigen2,
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde4toys"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdeedu</title>
-
-    <para>Install <application>kde4toys</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DDISABLE_VIDEOSUPPORT=ON</option>: Set this option in case you didn't
-    have <ulink url="http://hansdegoede.livejournal.com/3636.html">libv4l</ulink> installed.</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>amor, kteatime, ktux</seg>
-        <seg></seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4toys">
-        <term><command>kde4toys</command></term>
-        <listitem>
-          <para>is a testing utility for kde4toys-generated build trees.</para>
-          <indexterm zone="a-kde4toys kde4toys">
-            <primary sortas="b-kde4toys">kdetoys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: kde4/core/config.xml
===================================================================
--- kde4/core/config.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
+++ kde4/core/config.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="kde4-core-config" xreflabel="Starting KDE4">
+  <?dbhtml filename="config.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Starting KDE4</title>
+  
+  <para>After <application>Kde-workspace</application> has been installed, the 
+  first important milestone has been reached. Now you need to configure your 
+  system to start KDE4.</para>
+  
+  <sect2 role="content">
+  <title>Starting KDE4 from the command prompt</title>
+
+ <para>To start <application>KDE4</application> from the command prompt, you 
+ first need to modify your <filename>.xinitrc</filename> file:</para>
+    
+<screen><userinput>cat > ~/.xinitrc &lt;&lt;EOF
+# Begin .xinitrc
+
+exec ck-launch-session dbus-launch --exit-with-session startkde
+
+# End .xinitrc
+EOF</userinput></screen>
+
+    <note><para>If you are not using <application>ConsoleKit</application>, remove 
+    <userinput>ck-launch-session</userinput>.</para></note>
+    
+    <para>You can now start KDE4 using the <command>startx</command> command.</para>
+      
+    </sect2>
+    
+    <sect2 role="content">
+    <title>Starting KDE4 at boot</title>
+    
+    <para>KDE4 comes with a graphical login interface called KDM (the KDE Display 
+    Manager). KDM provides a customizable graphical login at boot. To use KDM, 
+    you need to edit your <filename>/etc/inittab</filename> file (as the 
+    <systemitem class="username">root</systemitem> user).
+    First, setup run-level 5 to start KDM by adding the following line (adjust 
+    the path to kdm according to your system):</para>
+    
+<screen><userinput>kd:5:respawn:/opt/kde4/bin/kdm</userinput></screen>
+
+    <para>Additionally, you need to change the default run-level from 3 to 5. This 
+    is done by changing the line:</para>
+
+<screen><userinput>id:3:initdefault:</userinput></screen>
+
+    <para>To:</para>
+
+<screen><userinput>id:5:initdefault:</userinput></screen>
+  
+    <para>You can now restart your system and see the beautiful KDE4 login 
+    screen.</para>
+  
+  </sect2>
+  
+  <sect2 role="content">
+    <title>Installing further KDE4 packages</title>
+    <para>Every subsequent package can be built while having <application>KDE4</application> up and 
+    running, but remember to keep <envar>&kde4-dir;</envar> and <envar>$QT4DIR</envar> set.</para>
+  </sect2>
+   
+</sect1>
Index: kde4/core/core.xml
===================================================================
--- kde4/core/core.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ kde4/core/core.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -32,4 +32,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4workspace.xml"/>
-
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
+  
 </chapter>
Index: kde4/core/kde4workspace.xml
===================================================================
--- kde4/core/kde4workspace.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ kde4/core/kde4workspace.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -82,5 +82,5 @@
     <xref linkend="freetype2"/>, 
     <xref linkend="pciutils"/> and
-    <xref linkend="consolekit"/>, 
+    <xref linkend="consolekit"/>
     </para>
 
@@ -174,35 +174,4 @@
 -->
   </sect2>
-
-  <sect2 role="content">
-
-    <title>Starting KDE4</title>
-
-    <para>After <application>Kde-workspace</application> has finished, the first 
-    important milestone has been reached. Now you can start <application>KDE4</application>.
-    Modify your <filename>.xinitrc</filename>:</para>
-    
-    <screen><userinput>cat > ~/.xinitrc &lt;&lt;EOF
-# Begin .xinitrc file
-#setxkbmap -layout de -model pc105 -variant nodeadkeys
-setxkbmap -layout de -model pc105
-#
-## Start TWM
-#xterm  -g 80x40+0+0   &amp;
-#xclock -g 100x100-0+0 &amp;
-#twm
-
-# Start KDE
-exec dbus-launch --exit-with-session startkde
-#startkde
-EOF</userinput></screen>
-
-    <para>Tweak this file to match your needs, especially setting the keyboard layout
-    if you do not have a <filename>/etc/X11/xorg.conf</filename>. If you are using <application>
-    ConsoleKit</application>, add <userinput>ck-launch-session</userinput> before dbus-launch.
-    Every subsequent package can be built while having <application>KDE4</application> up and 
-    running, but remember to keep <envar>&kde4-dir;</envar> and <envar>$QT4DIR</envar> set.</para>
-    
-  </sect2>
   
 </sect1>
Index: e4/devel/devel.xml
===================================================================
--- kde4/devel/devel.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<chapter id="kde4-devel">
-  <?dbhtml filename="kde4devel.html"?>
-
-  <title>KDE4 Development</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4sdk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde4webdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevplatform.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevelop4.xml"/>
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdevelop4-php.xml"/>
--->
-</chapter>
Index: e4/devel/kde4sdk.xml
===================================================================
--- kde4/devel/kde4sdk.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kde4sdk-download-http "&kde4-download-http;&kde4sdk-version;/src/kdesdk-&kde4sdk-version;.tar.bz2">
-  <!ENTITY kde4sdk-download-ftp  "&kde4-download-ftp;&kde4sdk-version;/src/kdesdk-&kde4sdk-version;.tar.bz2">
-  <!ENTITY kde4sdk-md5sum        "3bb8a404758e3fa9f2ca1658d175c094">
-  <!ENTITY kde4sdk-size          "6 MB">
-  <!ENTITY kde4sdk-buildsize     "589 MB">
-  <!ENTITY kde4sdk-time          "10.7 SBU">
-]>
-
-<sect1 id="kde4sdk" xreflabel="kdesdk-&kde4sdk-version;">
-  <?dbhtml filename="kde4sdk.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdesdk-&kde4sdk-version;</title>
-
-  <indexterm zone="kde4sdk">
-    <primary sortas="a-kde4sdk">kde4sdk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdesdk</title>
-
-    <para>This package several applications useful for developers. Programs include a 
-    version control system front-end for CVS, a program to view the differences between 
-    files, a UML Modeller, and a profile data visualization tool. </para> 
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde4sdk-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde4sdk-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde4sdk-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde4sdk-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde4sdk-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde4sdk-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4sdk-&kdesdk-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdesdk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="libxml2"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="qca"/>,
-    <xref linkend="kde4pimlibs"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="strigi"/>,
-    <xref linkend="subversion"/>, 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    HUNSPELL, Antlr
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde4sdk"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdesdk</title>
-
-    <para>Install <application>Kdesdk</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>adddebug, build-progress.sh, cervisia, cheatmake, colorsvn, create_cvsignore,
-        create_makefile, create_makefiles, create_svnignore, cvsaddcurrentdir, cvsaskpass,
-        cvsbackport, cvsblame, cvscheck, cvs-clean, cvsforwardport, cvslastchange, cvslastlog,
-        cvsrevertlast, cvsservice, cvsversion, cxxmetric, demangle, dprof2calltree, extend_dmalloc,
-        extractattr, extractqml, extractrc, findmissingcrystal, fix-include.sh, fixkdeincludes,
-        fixuifiles, hotshot2calltree, includemocs, kapptemplate, kate, kcachegrind, kdedoc, 
-        kde_generate_export_header, kdekillall, kdelnk2desktop.py, kdemangen.pl, kdesrc-build,
-        kde-systemsettings-tree.py, kio_svn_helper, kminspector, kmmatch, kmtrace, kompare, kpartloader,
-        krazy-licensecheck, kstartperf, ktesnippets_editor, kuiviewer, makeobj, memprof2calltree,
-        noncvslist, nonsvnlist, okteta, op2calltree, optimizegraphics, package_crystalsvg, png2mng.pl,
-        pprof2calltree, pruneemptydirs, qtdoc, split2po, svnbackport, svnchangesince, svn-clean,
-        svnforwardport, svngettags, svnintegrate, svnlastchange, svnlastlog, svnrevertlast, svnversions,
-        umbrello, wcgrep, xml2pot, zonetab2pot.py</seg>
-        <seg>libkastencontrollers.so, libkastencore.so, libkastengui.so, libkateinterfaces.so,
-        libkdeinit4_cervisia.so, libkdeinit4_cvsaskpass.so, libkdeinit4_cvsservice.so,
-        libkdeinit4_kate.so, libkomparedialogpages.so, libkomparediff2.so, libkompareinterface.so,
-        libktexteditor_codesnippets_core.so, libktrace.so, liboktetacore.so, liboktetagui.so,
-        liboktetakastencontrollers.so, liboktetakastencore.so, liboktetakastengui.so</seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4sdk">
-        <term><command>kde4sdk</command></term>
-        <listitem>
-          <para>is a testing utility for kde4sdk-generated build trees.</para>
-          <indexterm zone="a-kde4sdk kde4sdk">
-            <primary sortas="b-kde4sdk">kdesdk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: e4/devel/kde4webdev.xml
===================================================================
--- kde4/devel/kde4webdev.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kde4webdev-download-http "&kde4-download-http;&kde4webdev-version;/src/kdewebdev-&kde4webdev-version;.tar.bz2">
-  <!ENTITY kde4webdev-download-ftp  "&kde4-download-ftp;&kde4webdev-version;/src/kdewebdev-&kde4webdev-version;.tar.bz2">
-  <!ENTITY kde4webdev-md5sum        "9ea899175bc58d5a9333d858b12f705c">
-  <!ENTITY kde4webdev-size          "2.1 MB">
-  <!ENTITY kde4webdev-buildsize     "88 MB">
-  <!ENTITY kde4webdev-time          "1.8 SBU">
-]>
-
-<sect1 id="kde4webdev" xreflabel="kdewebdev-&kde4webdev-version;">
-  <?dbhtml filename="kde4webdev.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdewebdev-&kde4webdev-version;</title>
-
-  <indexterm zone="kde4webdev">
-    <primary sortas="a-kde4webdev">kde4webdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdewebdev</title>
-
-    <para>This package provides tools and editors for web development.</para> 
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde4webdev-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde4webdev-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde4webdev-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde4webdev-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde4webdev-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde4webdev-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4webdev-&kdewebdev-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdewebdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="libxml2"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="kde4pimlibs"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="html-tidy"/>,
-    <xref linkend="ruby"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kde4webdev"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdewebdev</title>
-
-    <para>Install <application>Kdewebdev</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>kfilereplace, kimagemapeditor, klinkstatus, kommander</seg>
-        <seg>libklinkstatuscommon.so, libkommandercore.so, libkommanderwidgets.so</seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kde4webdev">
-        <term><command>kde4webdev</command></term>
-        <listitem>
-          <para>is a testing utility for kde4webdev-generated build trees.</para>
-          <indexterm zone="a-kde4webdev kde4webdev">
-            <primary sortas="b-kde4webdev">kdewebdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-
-     <note><title>Quanta</title>
-       <para>If you are missing the web development editor <application>Quanta</application>,
-       it's right, <application>Quanta</application> isn't there in <application>KDE4</application>.
-       Maybe later in future releases, but currently, the Kdevelop with PHP-plugins should
-       be used.</para>
-     </note>
-  </sect2>
-
-</sect1>
Index: e4/devel/kdevelop4.xml
===================================================================
--- kde4/devel/kdevelop4.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kdevelop4-download-http "&kdevel4-download-http;/kdevelop-&kdevelop4-version;.tar.bz2">
-  <!ENTITY kdevelop4-download-ftp  "&kdevel4-download-ftp;/kdevelop-&kdevelop4-version;.tar.bz2">
-  <!ENTITY kdevelop4-md5sum        "f418966fd2545d40e841c88121e7b93a">
-  <!ENTITY kdevelop4-size          "4.9 MB">
-  <!ENTITY kdevelop4-buildsize     "246 MB">
-  <!ENTITY kdevelop4-time          "5.5 SBU">
-]>
-
-<sect1 id="kdevelop4" xreflabel="kde4webdev-&kdevelop4-version;">
-  <?dbhtml filename="kdevelop4.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdevelop-&kdevelop4-version;</title>
-
-  <indexterm zone="kdevelop4">
-    <primary sortas="a-kdevelop4">kde4webdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdevelop</title>
-
-    <para>This package provides tools and editors for development.</para> 
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdevelop4-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdevelop4-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdevelop4-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdevelop4-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdevelop4-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdevelop4-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdevelop4-&kdewebdev-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdevelop Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdevplatform"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdevelop4"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdevelop</title>
-
-    <para>Install <application>Kdevelop</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>kdevelop</seg>
-        <seg>libkdev4cmakecommon.so, libkdev4cppdochain.so, libkdev4cppparser.so, libkdev4cpprpp.so</seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kdevelop4">
-        <term><command>kdevelop4</command></term>
-        <listitem>
-          <para>is a testing utility for kdevelop4-generated build trees.</para>
-          <indexterm zone="a-kdevelop4 kde4webdev">
-            <primary sortas="b-kdevelop4">kdewebdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: e4/devel/kdevplatform.xml
===================================================================
--- kde4/devel/kdevplatform.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY kdevplatform-download-http "&kdevel4-download-http;/kdevplatform-&kdevplatform-version;.tar.bz2">
-  <!ENTITY kdevplatform-download-ftp  "&kdevel4-download-ftp;/kdevplatform-&kdevplatform-version;.tar.bz2">
-  <!ENTITY kdevplatform-md5sum        "bcfaa34dccd210faa59ca89ffacee067">
-  <!ENTITY kdevplatform-size          "1.7 MB">
-  <!ENTITY kdevplatform-buildsize     "328 MB">
-  <!ENTITY kdevplatform-time          "6.5 SBU">
-]>
-
-<sect1 id="kdevplatform" xreflabel="kdevplatform-&kdevplatform-version;">
-  <?dbhtml filename="kdevplatform.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kdevplatform-&kdevplatform-version;</title>
-
-  <indexterm zone="kdevplatform">
-    <primary sortas="a-kdevplatform">kde4webdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kdevplatform</title>
-
-    <para>This package provides tools and editors for web development.</para> 
-
-    &lfs67_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kdevplatform-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kdevplatform-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kdevplatform-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kdevplatform-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kdevplatform-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kdevplatform-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdevplatform-&kdewebdev-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdevplatform Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="libxml2"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="kde4pimlibs"/>,
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="subversion"/>,
-    <xref linkend="boost"/>,
-    apr, apr-utils, 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    Qjson
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kdevplatform"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kdevplatform</title>
-
-    <para>Install <application>Kdevplatform</application> by running
-    the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
-       
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \
-    -DKDE_DEFAULT_HOME=.kde4 \
-    -DSYSCONF_INSTALL_DIR=/etc/sysconfig \
-    .. &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="commands">
-    <title>Command Explanations</title>
-
-    <para><option>- -xyz</option>: This option is set for ...</para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libkdevplatformdebugger.so, libkdevplatformdocumentation.so, libkdevplatforminterfaces.so,
-        libkdevplatformlanguage.so, libkdevplatformoutputview.so, libkdevplatformproject.so,
-        libkdevplatformshell.so, libkdevplatformvcs.so, libsubline.so</seg>
-        <seg></seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-kdevplatform">
-        <term><command>kdevplatform</command></term>
-        <listitem>
-          <para>is a testing utility for kdevplatform-generated build trees.</para>
-          <indexterm zone="a-kdevplatform kde4webdev">
-            <primary sortas="b-kdevplatform">kdewebdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: kde4/kde4.xml
===================================================================
--- kde4/kde4.xml	(revision 52b1b8c4c28ac3c3a7436256f20a770fd1f27b44)
+++ kde4/kde4.xml	(revision d275f967b1b8275813139b40287c269f2143ef96)
@@ -32,5 +32,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add/add.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="devel/devel.xml"/>
 <!--
   Language packs!
