Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/akonadi.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -63,15 +63,14 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="shared-mime-info"/>,
-    <xref linkend="boost"/>, and one of:
-     <xref linkend="sqlite"/>,
-     <xref linkend="mariadb"/>, 
-     <ulink url="http://www.mysql.com/">MySQL</ulink>, or
-     <xref linkend="postgresql"/>
+      <xref linkend="boost"/>, one of:
+      <xref linkend="sqlite"/>,
+      <xref linkend="mariadb"/>, or
+      <xref linkend="postgresql"/>, and
+      <xref linkend="shared-mime-info"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="&sourceforge-repo;/soprano/">soprano</ulink>
+      <ulink url="&sourceforge-repo;/soprano/">Soprano</ulink>
     </para>
 
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/attica.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -24,5 +24,5 @@
 
   <indexterm zone="attica">
-    <primary sortas="a-attica">attica</primary>
+    <primary sortas="a-Attica">Attica</primary>
   </indexterm>
 
@@ -63,11 +63,4 @@
       <xref linkend="cmake"/> and
       <xref linkend="qt4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="qt5"/> (requires
-      <ulink url="http://quickgit.kde.org/index.php?p=extra-cmake-modules.git">
-      extra-cmake-modules</ulink>)
     </para>
 
Index: kde/core/automoc4.xml
===================================================================
--- kde/core/automoc4.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/automoc4.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="automoc4" xreflabel="automoc4-&automoc4-version;">
+<sect1 id="automoc4" xreflabel="Automoc4-&automoc4-version;">
   <?dbhtml filename="automoc4.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="automoc4">
-    <primary sortas="a-automoc4">automoc4</primary>
+    <primary sortas="a-Automoc4">Automoc4</primary>
   </indexterm>
 
@@ -58,20 +58,10 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/automoc4-&automoc4-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
     <bridgehead renderas="sect3">Automoc4 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="cmake"/> and
-    <xref linkend="qt4"/>
+      <xref linkend="cmake"/> and
+      <xref linkend="qt4"/>
     </para>
 
@@ -84,5 +74,5 @@
     <title>Installation of Automoc4</title>
 
-    <para>Install <application>automoc4</application> by running the following
+    <para>Install <application>Automoc4</application> by running the following
     commands:</para>
 
Index: kde/core/baloo-widgets.xml
===================================================================
--- kde/core/baloo-widgets.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/baloo-widgets.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="baloo-widgets" xreflabel="baloo-widgets-&kde-version;">
+<sect1 id="baloo-widgets" xreflabel="Baloo-Widgets-&kde-version;">
   <?dbhtml filename="baloo-widgets.html"?>
 
@@ -21,14 +21,14 @@
   </sect1info>
 
-  <title>Baloo-widgets-&kde-version;</title>
+  <title>Baloo-Widgets-&kde-version;</title>
 
   <indexterm zone="baloo-widgets">
-    <primary sortas="a-baloo-widgets">baloo-widgets</primary>
+    <primary sortas="a-Baloo-Widgets">Baloo-Widgets</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Baloo-widgets</title>
+    <title>Introduction to Baloo-Widgets</title>
 
-    <para>Baloo-widgets contains widgets for the baloo search framework.</para>
+    <para>Baloo-Widgets contains widgets for the Baloo search framework.</para>
 
     &lfs76_checked;
@@ -56,5 +56,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Baloo-widgets Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Baloo-Widgets Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -70,7 +70,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Baloo-widgets</title>
+    <title>Installation of Baloo-Widgets</title>
 
-    <para>Install <application>baloo-widgets</application> by running the following
+    <para>Install <application>Baloo-Widgets</application> by running the following
     commands:</para>
 
Index: kde/core/baloo.xml
===================================================================
--- kde/core/baloo.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/baloo.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="baloo" xreflabel="baloo-&kde-version;">
+<sect1 id="baloo" xreflabel="Baloo-&kde-version;">
   <?dbhtml filename="baloo.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="baloo">
-    <primary sortas="a-baloo">baloo</primary>
+    <primary sortas="a-Baloo">Baloo</primary>
   </indexterm>
 
@@ -79,5 +79,5 @@
     <title>Installation of Baloo</title>
 
-    <para>Install <application>baloo</application> by running the following
+    <para>Install <application>Baloo</application> by running the following
     commands:</para>
 
Index: kde/core/config-systemd.xml
===================================================================
--- kde/core/config-systemd.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
+++ kde/core/config-systemd.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -0,0 +1,94 @@
+<?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="kde-core-config" xreflabel="Starting KDE">
+  <?dbhtml filename="config.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Starting KDE</title>
+
+  <bridgehead renderas="sect3">KDE Startup Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Optional</bridgehead>
+  <para role="optional">
+    <xref linkend="dbus"/> (runtime)
+  </para>
+
+  <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 KDE.</para>
+
+  <sect2 role="content">
+  <title>Starting KDE from the command prompt</title>
+
+ <para>To start <application>KDE</application> from the command prompt, you
+ first need to modify your <filename>.xinitrc</filename> file:</para>
+
+<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; EOF
+<literal># Begin .xinitrc
+
+exec dbus-launch --exit-with-session startkde
+
+# End .xinitrc</literal>
+EOF</userinput></screen>
+
+    <para>You can now start KDE using the <command>startx</command> command.</para>
+
+    </sect2>
+
+    <sect2 role="content">
+    <title>Starting KDE at boot</title>
+
+    <para>KDE comes with a graphical login interface called KDM (the KDE Display
+    Manager), which provides a customizable graphical login at boot. To use KDM,
+    you need to create and enable a systemd unit by running the following commands
+    as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>cat &gt; /lib/systemd/system/kdm.service &lt;&lt; EOF &amp;&amp;
+<literal>[Unit]
+Description=K Display Manager
+After=systemd-user-sessions.service
+
+[Service]
+ExecStart=&kde-dir;/bin/kdm -nodaemon
+
+[Install]
+Alias=display-manager.service</literal>
+EOF
+systemctl enable kdm</userinput></screen>
+
+    <para>You can now restart your system and see the KDE login
+    screen.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Installing further languages (l10n)</title>
+
+    <para>You may want to install support for your locale language. The l10n
+    packages can be found at <ulink
+    url="&kde-download-http;&kde-version;/src/kde-l10n/">&kde-download-http;&kde-version;/src/kde-l10n/</ulink>.
+    See <xref linkend="kde-add-pkgs"/> for build instructions. If you are in a
+    KDE session when installing a new language and configure KDE to use it, the
+    session needs to be restarted, in order to see the effects.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Installing further KDE packages</title>
+
+    <para>Every subsequent package can be built while having
+    <application>KDE</application> up and running, but remember to keep
+    <envar>&kde-dir;</envar> set.</para>
+
+  </sect2>
+
+</sect1>
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ 	(revision )
@@ -1,94 +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;
-]>
-
-<sect1 id="kde-core-config" xreflabel="Starting KDE">
-  <?dbhtml filename="config.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Starting KDE</title>
-
-  <bridgehead renderas="sect3">KDE Startup Dependencies</bridgehead>
-
-  <bridgehead renderas="sect4">Optional</bridgehead>
-  <para role="optional">
-    <xref linkend="dbus"/> (runtime)
-  </para>
-
-  <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 KDE.</para>
-
-  <sect2 role="content">
-  <title>Starting KDE from the command prompt</title>
-
- <para>To start <application>KDE</application> from the command prompt, you
- first need to modify your <filename>.xinitrc</filename> file:</para>
-
-<screen><userinput>cat &gt; ~/.xinitrc &lt;&lt; EOF
-<literal># Begin .xinitrc
-
-exec ck-launch-session dbus-launch --exit-with-session startkde
-
-# End .xinitrc</literal>
-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 KDE using the <command>startx</command> command.</para>
-
-    </sect2>
-
-    <sect2 role="content">
-    <title>Starting KDE at boot</title>
-
-    <para>KDE comes with a graphical login interface called KDM (the KDE Display
-    Manager), which 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 (adjust
-    the path to kdm according to your system):</para>
-
-<screen><userinput>cat &gt;&gt; /etc/inittab &lt;&lt; EOF
-<literal>kd:5:respawn:/opt/kde/bin/kdm</literal>
-EOF</userinput></screen>
-
-    <para>Additionally, you need to change the default run-level from 3 to 5:</para>
-
-<screen><userinput>sed -i 's#id:3:initdefault:#id:5:initdefault:#' /etc/inittab</userinput></screen>
-
-    <para>You can now restart your system and see the KDE login
-    screen.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Installing further languages (l10n)</title>
-
-    <para>You may want to install support for your locale language. The l10n
-    packages can be found at <ulink
-    url="&kde-download-http;&kde-version;/src/kde-l10n/">&kde-download-http;&kde-version;/src/kde-l10n/</ulink>.
-    See <xref linkend="kde-add-pkgs"/> for build instructions. If you are in a
-    KDE session when installing a new language and configure KDE to use it, the
-    session needs to be restarted, in order to see the effects.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Installing further KDE packages</title>
-
-    <para>Every subsequent package can be built while having
-    <application>KDE</application> up and running, but remember to keep
-    <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
-
-  </sect2>
-
-</sect1>
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/core.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -23,5 +23,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attica.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qimageblitz.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shrdesktopontologies.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
@@ -32,12 +31,10 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baloo-widgets.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-widgets.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-baseapps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-base-artwork.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-workspace-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="config-systemd.xml"/>
 
 </chapter>
Index: kde/core/kactivities.xml
===================================================================
--- kde/core/kactivities.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kactivities.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kactivities" xreflabel="kactivities-&kactivities-version;">
+<sect1 id="kactivities" xreflabel="KActivities-&kactivities-version;">
   <?dbhtml filename="kactivities.html"?>
 
@@ -21,14 +21,14 @@
   </sect1info>
 
-  <title>Kactivities-&kactivities-version;</title>
+  <title>KActivities-&kactivities-version;</title>
 
   <indexterm zone="kactivities">
-    <primary sortas="a-kactivities">kactivities</primary>
+    <primary sortas="a-KActivities">KActivities</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Kactivities</title>
+    <title>Introduction to KActivities</title>
 
-    <para>This package provides the activitymanager for KDE.</para>
+    <para>This package provides the activity manager for KDE.</para>
 
     &lfs76_checked;
@@ -56,14 +56,5 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kactivities-&kdelibs-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kactivities Dependencies</bridgehead>
+    <bridgehead renderas="sect3">KActivities Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -74,5 +65,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="&kde-download-http;&kde-version;/src">nepomuk-core</ulink>
+      <ulink url="&kde-download-http;&kde-version;/src">Nepomuk-Core</ulink>
     </para>
 
@@ -84,10 +75,9 @@
 
   <sect2 role="installation">
-    <title>Installation of Kactivities</title>
+    <title>Installation of KActivities</title>
 
-    <para>Install <application>Kactivities</application> by running the following
+    <para>Install <application>KActivities</application> by running the following
     commands:</para>
 
-<!-- Nothing in sysconfdir here, too -->
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kde-base-artwork.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kde-base-artwork" xreflabel="kde-base-artwork-&kde-version;">
+<sect1 id="kde-base-artwork" xreflabel="KDE-Base-Artwork-&kde-version;">
   <?dbhtml filename="kde-base-artwork.html"?>
 
@@ -21,12 +21,12 @@
   </sect1info>
 
-  <title>Kde-base-artwork-&kde-version;</title>
+  <title>KDE-Base-Artwork-&kde-version;</title>
 
   <indexterm zone="kde-base-artwork">
-    <primary sortas="a-kde-base-artwork">kde-base-artwork</primary>
+    <primary sortas="a-KDE-Base-Artwork">KDE-Base-Artwork</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Kde-base-artwork</title>
+    <title>Introduction to KDE-Base-Artwork</title>
 
     <para>This package provides the default splash screen for KDE.</para>
@@ -56,9 +56,9 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Kde-base-artwork Dependencies</bridgehead>
+    <bridgehead renderas="sect3">KDE-Base-Artwork Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+      <xref linkend="kdelibs"/>
     </para>
 
@@ -70,7 +70,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Kde-base-artwork</title>
+    <title>Installation of KDE-Base-Artwork</title>
 
-    <para>Install <application>Kde-base-artwork</application> by running
+    <para>Install <application>KDE-Base-Artwork</application> by running
     the following commands:</para>
 
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kde-baseapps.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kde-baseapps" xreflabel="kde-baseapps-&kde-version;">
+<sect1 id="kde-baseapps" xreflabel="KDE-Baseapps-&kde-version;">
   <?dbhtml filename="kde-baseapps.html"?>
 
@@ -21,12 +21,12 @@
   </sect1info>
 
-  <title>Kde-baseapps-&kde-version;</title>
+  <title>KDE-Baseapps-&kde-version;</title>
 
   <indexterm zone="kde-baseapps">
-    <primary sortas="a-kde-baseapps">kde-baseapps</primary>
+    <primary sortas="a-KDE-Baseapps">KDE-Baseapps</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Kde-baseapps</title>
+    <title>Introduction to KDE-Baseapps</title>
 
     <para>This package provides various applications, such as Dolphin
@@ -58,23 +58,23 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Kde-baseapps Dependencies</bridgehead>
+    <bridgehead renderas="sect3">KDE-Baseapps Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+      <xref linkend="kdelibs"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="kactivities"/>,
-    <xref linkend="kfilemetadata"/>,
-    <xref linkend="baloo"/>, and
-    <xref linkend="baloo-widgets"/>
+      <xref linkend="baloo"/>,
+      <xref linkend="baloo-widgets"/>,
+      <xref linkend="kactivities"/>, and
+      <xref linkend="kfilemetadata"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="html-tidy"/> and
-    <xref linkend="glib2"/>
+      <xref linkend="glib2"/> and
+      <xref linkend="html-tidy"/>
     </para>
 
@@ -86,7 +86,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Kde-baseapps</title>
+    <title>Installation of KDE-Baseapps</title>
 
-    <para>Install <application>Kde-baseapps</application> by running the following
+    <para>Install <application>KDE-Baseapps</application> by running the following
     commands:</para>
 
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kde-runtime.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kde-runtime" xreflabel="kde-runtime-&kde-version;">
+<sect1 id="kde-runtime" xreflabel="KDE-Runtime-&kde-version;">
   <?dbhtml filename="kde-runtime.html"?>
 
@@ -21,5 +21,5 @@
   </sect1info>
 
-  <title>Kde-runtime-&kde-version;</title>
+  <title>KDE-Runtime-&kde-version;</title>
 
   <indexterm zone="kde-runtime">
@@ -28,7 +28,7 @@
 
   <sect2 role="package">
-    <title>Introduction to Kde-runtime</title>
+    <title>Introduction to KDE-Runtime</title>
 
-    <para>Kde-runtime contains runtime applications and libraries essential
+    <para>KDE-Runtime contains runtime applications and libraries essential
     for <application>KDE</application>.</para>
 
@@ -57,5 +57,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Kde-runtime Dependencies</bridgehead>
+    <bridgehead renderas="sect3">KDE-Runtime Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -66,23 +66,22 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
       <para role="recommended">
-      <xref linkend="kactivities"/>,
-      <xref linkend="kdepimlibs"/>,
       <xref linkend="alsa-lib"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="exiv2"/>
+      <xref linkend="exiv2"/>,
+      <xref linkend="kactivities"/>, and
+      <xref linkend="kdepimlibs"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="libcanberra"/>,
+      <xref linkend="NetworkManager"/>,
       <xref linkend="pulseaudio"/>,
+      <xref linkend="samba"/>,
       <xref linkend="xine-lib"/>,
-      <xref linkend="libcanberra"/>,
-      <xref linkend="samba"/>,
-      <xref linkend="NetworkManager"/>,
-      <ulink url="&kde-download-http;&kde-version;/src/">nepomuk-core</ulink>,
-      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-      <ulink url="http://launchpad.net/ntrack">QNtrack</ulink>,
-      <ulink url="http://www.libssh.org/">LibSSH</ulink>, and
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>
+      <ulink url="http://www.libssh.org/">LibSSH</ulink>,
+      <ulink url="&kde-download-http;&kde-version;/src/">Nepomuk-Core</ulink>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>, and
+      <ulink url="http://launchpad.net/ntrack">QNtrack</ulink>
     </para>
 
@@ -94,7 +93,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Kde-runtime</title>
+    <title>Installation of KDE-Runtime</title>
 
-    <para>Install <application>kde-runtime</application> by running the following
+    <para>Install <application>KDE-Runtime</application> by running the following
     commands:</para>
 
@@ -103,6 +102,6 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;         \
-      -DSYSCONF_INSTALL_DIR=/etc                  \
-      -DCMAKE_BUILD_TYPE=Release                  \
+      -DSYSCONF_INSTALL_DIR=/etc                 \
+      -DCMAKE_BUILD_TYPE=Release                 \
       -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \
       -Wno-dev .. &amp;&amp;
Index: kde/core/kde-workspace-systemd.xml
===================================================================
--- kde/core/kde-workspace-systemd.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
+++ kde/core/kde-workspace-systemd.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -0,0 +1,250 @@
+<?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 ws-dir "4.14.2">
+  <!ENTITY kde-workspace-download-http "&kde-download-http;&ws-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;&ws-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-md5sum        "64dc4f44a7df7bcde32633a4ad036edb">
+  <!ENTITY kde-workspace-size          "12.9 MB">
+  <!ENTITY kde-workspace-buildsize     "391 MB">
+  <!ENTITY kde-workspace-time          "12.8 SBU">
+]>
+
+<sect1 id="kde-workspace" xreflabel="KDE-Workspace-&kde-workspace-version;">
+  <?dbhtml filename="kde-workspace.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>KDE-Workspace-&kde-workspace-version;</title>
+
+  <indexterm zone="kde-workspace">
+    <primary sortas="a-KDE-Workspace">KDE-Workspace</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to KDE-Workspace</title>
+
+    <para>
+      The KDE-Workspace package contains components that are central to
+      providing the <application>KDE</application> desktop environment. Of
+      particular importance are KWin, the <application>KDE</application>
+      window manager, and Plasma, which provides the workspace interface.
+    </para>
+
+    &lfs76_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&kde-workspace-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&kde-workspace-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &kde-workspace-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &kde-workspace-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &kde-workspace-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &kde-workspace-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">KDE-Workspace Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="kactivities"/>,
+      <xref linkend="qimageblitz"/>,
+      <xref linkend="xcb-util-image"/>,
+      <xref linkend="xcb-util-keysyms"/>,
+      <xref linkend="xcb-util-renderutil"/>, and
+      <xref linkend="xcb-util-wm"/>      
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="boost"/>,
+      <xref linkend="kdepimlibs"/>,
+      <xref linkend="pciutils"/>, and
+      <xref linkend="systemd"/> (for Logind)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libusb-compat"/>,
+      <xref linkend="linux-pam"/>,
+      <xref linkend="lm_sensors"/>,
+      <xref linkend="NetworkManager"/>,
+      <xref linkend="qjson"/>,
+      <xref linkend="wayland"/>,
+      <ulink url="http://code.google.com/p/google-gadgets-for-linux/">GoogleGadgets</ulink>,
+      <ulink url="http://www.catb.org/gpsd/">GPSD</ulink>,
+      <ulink url="http://qalculate.sourceforge.net/">libqalculate</ulink>
+      (wants <ulink url="http://www.ginac.de/CLN/">CLN</ulink>),
+      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
+      <ulink url="http://projects.kde.org/prison">Prison</ulink>,
+      <ulink url="&kde-download-http;&kde-version;/src/">PyKDE4</ulink>, and
+      <ulink url="http://www.xmms.org/">XMMS</ulink>
+    </para>
+
+    <note>
+      <para>
+        KDE-Workspace has a run-time dependency called
+        <application>Application menu for Qt</application> that allows the
+        application menubar to be inserted as a single button in the titlebar.
+        It can be found at 
+        <ulink url="https://launchpad.net/appmenu-qt">appmenu-qt</ulink>.
+      </para>
+    </note>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/kde-workspace"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of KDE-Workspace</title>
+
+    <para>
+      It is recommended to have a dedicated user and group to take
+      control of the <command>kdm</command> daemon after it is
+      started. Issue the following commands as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>groupadd -g 37 kdm &amp;&amp;
+useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm \
+        -u 37 -s /bin/false kdm &amp;&amp;
+install -o kdm -g kdm -dm755 /var/lib/kdm</userinput></screen>
+
+    <para>
+      Install <application>KDE-Workspace</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;           \
+      -DSYSCONF_INSTALL_DIR=/etc                   \
+      -DCMAKE_BUILD_TYPE=Release                   \
+      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install                  &amp;&amp;
+mkdir -pv /usr/share/xsessions &amp;&amp;
+ln -sfv &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop \
+       /usr/share/xsessions/kde-plasma.desktop</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><option>-DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE</option>: This option is
+    set to install the KDE Python objects in the correct place.</para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring KDE Workspace</title>
+
+    <sect3>
+      <title>Linux PAM Configuration</title>
+
+      <para>
+        If you built <application>KDE Workspace</application> with
+        <application>Linux PAM</application> support, create necessary
+        configuration files by running the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/kde &lt;&lt; "EOF" &amp;&amp;
+# Begin /etc/pam.d/kde
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
+auth     include        system-auth
+
+account  include        system-account
+password include        system-password
+session  include        system-session
+
+# End /etc/pam.d/kde
+EOF
+cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF" &amp;&amp;
+# Begin /etc/pam.d/kde-np
+
+auth     requisite      pam_nologin.so
+auth     required       pam_env.so
+
+auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
+auth     required       pam_permit.so
+
+account  include        system-account
+password include        system-password
+session  include        system-session
+
+# End /etc/pam.d/kde-np
+EOF
+cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
+# Begin /etc/pam.d/kscreensaver
+
+auth    include system-auth
+account include system-account
+
+# End /etc/pam.d/kscreensaver
+EOF</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>genkdmconf, kaccess, kapplymousetheme, kblankscrn.kss,
+        kcheckrunning, kcminit, kcminit_startup, kdm, kdmctl,
+        kdostartupconfig4, kfontinst, kfontview, kinfocenter, klipper,
+        kmenuedit, krandom.kss, krandrstartup, krandrtray, krdb, krunner,
+        ksmserver, ksplashqml, ksplashsimple, ksplashx, ksplashx_scale,
+        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwin_gles,
+        kwrited, oxygen-demo, oxygen-settings, oxygen-shadow-demo,
+        plasma-desktop, plasma-netbook, plasma-overlay, plasma-windowed,
+        solid-action-desktop-gen, solid-network, startkde and systemsettings
+        </seg>
+        <seg>several in &kde-dir;/lib</seg>
+        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ 	(revision )
@@ -1,260 +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 ws-dir "4.14.2">
-  <!ENTITY kde-workspace-download-http "&kde-download-http;&ws-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;&ws-dir;/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-md5sum        "64dc4f44a7df7bcde32633a4ad036edb">
-  <!ENTITY kde-workspace-size          "12.9 MB">
-  <!ENTITY kde-workspace-buildsize     "391 MB">
-  <!ENTITY kde-workspace-time          "12.8 SBU">
-]>
-
-<sect1 id="kde-workspace" xreflabel="kde-workspace-&kde-workspace-version;">
-  <?dbhtml filename="kde-workspace.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Kde-workspace-&kde-workspace-version;</title>
-
-  <indexterm zone="kde-workspace">
-    <primary sortas="a-kde-workspace">kde-workspace</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Kde-workspace</title>
-
-    <para>
-      The Kde-workspace package contains components that are central to
-      providing the <application>KDE</application> desktop environment. Of
-      particular importance are KWin, the <application>KDE</application>
-      window manager, and Plasma, which provides the workspace interface.
-    </para>
-
-    &lfs76_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&kde-workspace-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&kde-workspace-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &kde-workspace-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &kde-workspace-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &kde-workspace-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &kde-workspace-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde-workspace-&kde4-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kde-workspace Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kactivities"/>,
-      <xref linkend="qimageblitz"/>,
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-renderutil"/>,
-      <xref linkend="xcb-util-keysyms"/>, and
-      <xref linkend="xcb-util-wm"/>      
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="kdepimlibs"/>,
-      <xref linkend="boost"/>,
-      <xref linkend="freetype2"/>,
-      <xref linkend="pciutils"/>, and
-      <xref linkend="systemd"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="linux-pam"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="NetworkManager"/>,
-      <xref linkend="lm_sensors"/>,
-      <xref linkend="qjson"/>,
-      <ulink url="&kde-download-http;&kde-version;/src/">PyKDE4</ulink>,
-      <ulink url="http://code.google.com/p/google-gadgets-for-linux/">GoogleGadgets</ulink>,
-      <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>,
-      <ulink url="http://sourceforge.net/projects/libraw1394/">libraw1394</ulink>,
-      <ulink url="http://www.catb.org/gpsd/">gpsd</ulink>,
-      <ulink url="http://www.xmms.org/">XMMS</ulink>,
-      <ulink url="http://qalculate.sourceforge.net/">libqalculate</ulink>
-      (wants <ulink url="http://www.ginac.de/CLN/">CLN</ulink>), and
-      <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
-    </para>
-
-    <note>
-      <para>
-        Kde-workspace has a run-time dependency called
-        <application>Application menu for Qt</application> that allows the
-        application menubar to be inserted as a single button in the titlebar.
-        It can be found at 
-        <ulink url="https://launchpad.net/appmenu-qt">appmenu-qt</ulink>.
-      </para>
-    </note>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/kde-workspace"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kde-workspace</title>
-
-    <para>
-      It is recommended to have a dedicated user and group to take
-      control of the <command>kdm</command> daemon after it is
-      started. Issue the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>groupadd -g 37 kdm &amp;&amp;
-useradd -c "KDM Daemon Owner" -d /var/lib/kdm -g kdm \
-        -u 37 -s /bin/false kdm &amp;&amp;
-install -o kdm -g kdm -dm755 /var/lib/kdm</userinput></screen>
-
-    <para>
-      Install <application>Kde-workspace</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;           \
-      -DSYSCONF_INSTALL_DIR=/etc                   \
-      -DCMAKE_BUILD_TYPE=Release                   \
-      -DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install                  &amp;&amp;
-mkdir -p /usr/share/xsessions &amp;&amp;
-ln -sf &kde-dir;/share/apps/kdm/sessions/kde-plasma.desktop \
-       /usr/share/xsessions/kde-plasma.desktop</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DINSTALL_PYTHON_FILES_IN_PYTHON_PREFIX=TRUE</option>: This option is
-    set to install the KDE Python objects in the correct place.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring KDE Workspace</title>
-
-    <sect3>
-      <title>Linux PAM Configuration</title>
-
-      <para>
-        If you built <application>KDE Workspace</application> with
-        <application>Linux PAM</application> support, create necessary
-        configuration files by running the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/pam.d/kde &lt;&lt; "EOF" &amp;&amp;
-# Begin /etc/pam.d/kde
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     include        system-auth
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/kde
-EOF
-cat &gt; /etc/pam.d/kde-np &lt;&lt; "EOF" &amp;&amp;
-# Begin /etc/pam.d/kde-np
-
-auth     requisite      pam_nologin.so
-auth     required       pam_env.so
-
-auth     required       pam_succeed_if.so uid &gt;= 1000 quiet
-auth     required       pam_permit.so
-
-account  include        system-account
-password include        system-password
-session  include        system-session
-
-# End /etc/pam.d/kde-np
-EOF
-cat &gt; /etc/pam.d/kscreensaver &lt;&lt; "EOF"
-# Begin /etc/pam.d/kscreensaver
-
-auth    include system-auth
-account include system-account
-
-# End /etc/pam.d/kscreensaver
-EOF</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>genkdmconf, kaccess, kapplymousetheme, kblankscrn.kss,
-        kcheckrunning, kcminit, kcminit_startup, kdm, kdmctl,
-        kdostartupconfig4, kfontinst, kfontview, kinfocenter, klipper,
-        kmenuedit, krandom.kss, krandrstartup, krandrtray, krdb, krunner,
-        ksmserver, ksplashqml, ksplashsimple, ksplashx, ksplashx_scale,
-        kstartupconfig4, ksysguard, ksysguardd, ksystraycmd, kwin, kwin_gles,
-        kwrited, oxygen-demo, oxygen-settings, oxygen-shadow-demo,
-        plasma-desktop, plasma-netbook, plasma-overlay, plasma-windowed,
-        solid-action-desktop-gen, solid-network, startkde and systemsettings
-        </seg>
-        <seg>several in &kde-dir;/lib</seg>
-        <seg>several in &kde-dir;/include, &kde-dir;/lib and &kde-dir;/share
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kdelibs.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kdelibs" xreflabel="kdelibs-&kde-version;">
+<sect1 id="kdelibs" xreflabel="KDELibs-&kde-version;">
   <?dbhtml filename="kdelibs.html"?>
 
@@ -21,12 +21,12 @@
   </sect1info>
 
-  <title>Kdelibs-&kde-version;</title>
+  <title>KDELibs-&kde-version;</title>
 
   <indexterm zone="kdelibs">
-    <primary sortas="a-kdelibs">kdelibs</primary>
+    <primary sortas="a-KDELibs">KDELibs</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Kdelibs</title>
+    <title>Introduction to KDELibs</title>
 
     <para>This package includes programs and libraries that
@@ -57,14 +57,5 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kde4libs-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Kdelibs Dependencies</bridgehead>
+    <bridgehead renderas="sect3">KDELibs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -78,33 +69,34 @@
       <xref linkend="libpng"/>,
       <xref linkend="phonon"/>,
-      <xref linkend="strigi"/>, and
-      <xref linkend="shared-mime-info"/>
+      <xref linkend="shared-mime-info"/>, and
+      <xref linkend="strigi"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="openssl"/>,
       <xref linkend="polkit-qt"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="qca"/>,
-      <xref linkend="upower"/>, and
-      <xref linkend="udisks"/> or <xref linkend="udisks2"/>
+      <xref linkend="udisks"/> or
+      <xref linkend="udisks2"/>, and
+      <xref linkend="upower"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="jasper"/>,
-      <xref linkend="pcre"/>,
+      <xref linkend="aspell"/>,
       <xref linkend="avahi"/>,
-      <xref linkend="aspell"/>,
       <xref linkend="enchant"/>,
       <xref linkend="grantlee"/>,
+      <xref linkend="jasper"/>,
       <xref linkend="mitkrb"/>,
-      <ulink url="&sourceforge-repo;/soprano">soprano</ulink>,
-      <ulink url="&sourceforge-repo;/oscaf/">shared-desktop-ontologies</ulink>,
+      <xref linkend="pcre"/>,
+      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>,
       <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
-      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>,
       <ulink url="http://www.herqq.org/">HUPnP</ulink>,
-      <ulink url="http://www.openexr.com/">OpenEXR</ulink>, and
-      <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info">media-player-info</ulink>
+      <ulink url="http://www.freedesktop.org/wiki/Software/media-player-info">media-player-info</ulink>,
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>,
+      <ulink url="&sourceforge-repo;/oscaf/">Shared-Desktop-Ontologies</ulink>, and
+      <ulink url="&sourceforge-repo;/soprano/">Soprano</ulink>
     </para>
 
@@ -116,5 +108,14 @@
 
   <sect2 role="installation">
-    <title>Installation of Kdelibs</title>
+    <title>Installation of KDELibs</title>
+
+    <para>
+      First, silence a lot of warnings caused by using the latest toolchain
+      by running the following command:
+    </para>
+
+<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g"      \
+       cmake/modules/FindKDE4Internal.cmake \
+       kjsembed/qtonly/FindQJSInternal.cmake</userinput></screen>
 
     <para>Fix file conflicts with <application>GNOME Menus</application> by running
@@ -127,21 +128,9 @@
         kded/kbuildsycoca.cpp</userinput></screen>
 
-<!--
-    <para>Cmake looks for <application>Xorg</application> libraries in a set of
-    hard coded directories instead of using
-    <application>pkg-config</application>.  If <application>Xorg</application>
-    has not been installed in <filename class="directory">/usr</filename>, add
-    the location to the list:</para>
-
-<screen><userinput>sed -e "/SET(X11_LIB_SEARCH_PATH/ a $XORG_PREFIX/lib"     \
-    -e "/SET(X11_INC_SEARCH_PATH/ a $XORG_PREFIX/include" \
-    -i cmake/modules/FindX11.cmake</userinput></screen>
--->
-
-    <para>Install <application>Kdelibs</application> by running the following
+    <para>Install <application>KDELibs</application> by running the following
     commands:</para>
 
-<!-- I wouldn't recommend installing D-Bus configuration files outside of 
-     /etc if kde-dir is /usr, maybe kde-etc-dir should be introduced? -->
+<!-- I wouldn't recommend installing D-Bus configuration files outside of /etc if kde-dir is /usr,
+     maybe kde-etc-dir should be introduced? -->
 
 <screen><userinput>mkdir build &amp;&amp;
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kdepimlibs.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kdepimlibs" xreflabel="kdepimlibs-&kde-version;">
+<sect1 id="kdepimlibs" xreflabel="Kdepimlibs-&kde-version;">
   <?dbhtml filename="kdepimlibs.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="kdepimlibs">
-    <primary sortas="a-kdepimlibs">kdepimlibs</primary>
+    <primary sortas="a-Kdepimlibs">Kdepimlibs</primary>
   </indexterm>
 
@@ -58,24 +58,15 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/kdepimlibs-&kde-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Kdepimlibs Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="akonadi"/>,
+      <xref linkend="boost"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="gpgme"/>,
       <xref linkend="kdelibs"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="gpgme"/>,
       <xref linkend="libical"/>,
-      <xref linkend="akonadi"/>,
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="boost"/>, and
+      <xref linkend="libxslt"/>, and
       <xref linkend="qjson"/>
     </para>
@@ -89,5 +80,5 @@
     <para role="optional">
       <xref linkend="openssl"/> and
-      <ulink url="http://projects.kde.org/prison">prison</ulink>
+      <ulink url="http://projects.kde.org/prison">Prison</ulink>
     </para>
 
@@ -104,5 +95,4 @@
     commands:</para>
 
-<!-- Again, nothing in sysconfdir -->
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
Index: kde/core/kfilemetadata.xml
===================================================================
--- kde/core/kfilemetadata.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/kfilemetadata.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="kfilemetadata" xreflabel="kfilemetadata-&kde-version;">
+<sect1 id="kfilemetadata" xreflabel="KFileMetaData-&kde-version;">
   <?dbhtml filename="kfilemetadata.html"?>
 
@@ -21,14 +21,14 @@
   </sect1info>
 
-  <title>Kfilemetadata-&kde-version;</title>
+  <title>KFileMetaData-&kde-version;</title>
 
   <indexterm zone="kfilemetadata">
-    <primary sortas="a-kfilemetadata">kfilemetadata</primary>
+    <primary sortas="a-KFileMetaData">KFileMetaData</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Kfilemetadata</title>
+    <title>Introduction to KFileMetaData</title>
 
-    <para>Kfilemetadata is a framework for searching and managing metadata.</para>
+    <para>KFileMetaData is a framework for searching and managing metadata.</para>
 
     &lfs76_checked;
@@ -56,19 +56,19 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Kfilemetadata Dependencies</bridgehead>
+    <bridgehead renderas="sect3">KFileMetaData Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+      <xref linkend="kdelibs"/>
     </para>
     
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="taglib"/>,
-    <xref linkend="poppler"/>,
-    <xref linkend="exiv2"/>,
-    <xref linkend="ffmpeg"/>,
-    <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink> and
-    <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
+      <xref linkend="exiv2"/>,
+      <xref linkend="ffmpeg"/>,
+      <xref linkend="poppler"/>,
+      <xref linkend="taglib"/>,
+      <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink>, and
+      <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
     </para>
 
@@ -80,7 +80,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Kfilemetadata</title>
+    <title>Installation of KFileMetaData</title>
 
-    <para>Install <application>kfilemetadata</application> by running the following
+    <para>Install <application>KFileMetaData</application> by running the following
     commands:</para>
 
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/oxygen-icons.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="oxygen-icons" xreflabel="oxygen-icons-&kde-version;">
+<sect1 id="oxygen-icons" xreflabel="Oxygen-Icons-&kde-version;">
   <?dbhtml filename="oxygen-icons.html"?>
 
@@ -21,12 +21,12 @@
   </sect1info>
 
-  <title>Oxygen-icons-&kde-version;</title>
+  <title>Oxygen-Icons-&kde-version;</title>
 
   <indexterm zone="oxygen-icons">
-    <primary sortas="a-oxygen-icons">oxygen-icons</primary>
+    <primary sortas="a-Oxygen-Icons">Oxygen-Icons</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Oxygen-icons</title>
+    <title>Introduction to Oxygen-Icons</title>
 
     <para>The Oxygen theme is a photo-realistic icon style, with a
@@ -57,9 +57,9 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Oxygen-icons Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Oxygen-Icons Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="cmake"/>
+      <xref linkend="cmake"/>
     </para>
 
@@ -70,7 +70,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Oxygen-icons</title>
+    <title>Installation of Oxygen-Icons</title>
 
-    <para>Install <application>Oxygen-icons</application> by running
+    <para>Install <application>Oxygen-Icons</application> by running
     the following commands:</para>
 
Index: kde/core/phonon-backend-gstreamer.xml
===================================================================
--- kde/core/phonon-backend-gstreamer.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/phonon-backend-gstreamer.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="phonon-backend-gstreamer" xreflabel="phonon-backend-gstreamer-&phonon-backend-gstreamer-version;">
+<sect1 id="phonon-backend-gstreamer" xreflabel="Phonon-Backend-GStreamer-&phonon-backend-gstreamer-version;">
   <?dbhtml filename="phonon-backend-gstreamer.html"?>
 
@@ -21,12 +21,12 @@
   </sect1info>
 
-  <title>Phonon-backend-gstreamer-&phonon-backend-gstreamer-version;</title>
+  <title>Phonon-Backend-GStreamer-&phonon-backend-gstreamer-version;</title>
 
   <indexterm zone="phonon-backend-gstreamer">
-    <primary sortas="a-phonon-backend-gstreamer">phonon-backend-gstreamer</primary>
+    <primary sortas="a-Phonon-Backend-GStreamer">Phonon-Backend-GStreamer</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to the Phonon-backend-gstreamer</title>
+    <title>Introduction to the Phonon-Backend-GStreamer</title>
 
     <para>This package provides a <application>Phonon</application> backend which
@@ -57,18 +57,18 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Phonon-backend-gstreamer Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Phonon-Backend-GStreamer Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="phonon"/> and
-    <xref linkend="gstreamer10"/>
+      <xref linkend="gstreamer10"/> and
+      <xref linkend="phonon"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="gst10-plugins-base"/> (needed for output to ALSA),
-    <xref linkend="gst10-plugins-good"/> (needed for output to PulseAudio),
-    <xref linkend="gst10-plugins-bad"/> (needed for AAC/M4A support) and
-    <xref linkend="gst10-plugins-ugly"/> (needed for MP3 support)
+      <xref linkend="gst10-plugins-base"/> (needed for output to ALSA),
+      <xref linkend="gst10-plugins-good"/> (needed for output to PulseAudio),
+      <xref linkend="gst10-plugins-bad"/> (needed for AAC/M4A support) and
+      <xref linkend="gst10-plugins-ugly"/> (needed for MP3 support)
     </para>
 
@@ -79,7 +79,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Phonon-backend-gstreamer</title>
+    <title>Installation of Phonon-Backend-GStreamer</title>
 
-    <para>Install <application>Phonon-backend-gstreamer</application> by running the following
+    <para>Install <application>Phonon-Backend-GStreamer</application> by running the following
     commands:</para>
 
Index: kde/core/phonon-backend-vlc.xml
===================================================================
--- kde/core/phonon-backend-vlc.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/phonon-backend-vlc.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="phonon-backend-vlc" xreflabel="phonon-backend-vlc-&phonon-backend-vlc-version;">
+<sect1 id="phonon-backend-vlc" xreflabel="Phonon-Backend-VLC-&phonon-backend-vlc-version;">
   <?dbhtml filename="phonon-backend-vlc.html"?>
 
@@ -21,12 +21,12 @@
   </sect1info>
 
-  <title>Phonon-backend-vlc-&phonon-backend-vlc-version;</title>
+  <title>Phonon-Backend-VLC-&phonon-backend-vlc-version;</title>
 
   <indexterm zone="phonon-backend-vlc">
-    <primary sortas="a-phonon-backend-vlc">phonon-backend-vlc</primary>
+    <primary sortas="a-Phonon-Backend-VLC">Phonon-Backend-VLC</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to the Phonon-backend-vlc</title>
+    <title>Introduction to the Phonon-Backend-VLC</title>
 
     <para>This package provides a <application>Phonon</application> backend which
@@ -57,10 +57,10 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Phonon-backend-vlc Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Phonon-Backend-VLC Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="phonon"/> and
-    <xref linkend="vlc"/>
+      <xref linkend="phonon"/> and
+      <xref linkend="vlc"/>
     </para>
 
@@ -71,7 +71,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Phonon-backend-vlc</title>
+    <title>Installation of Phonon-Backend-VLC</title>
 
-    <para>Install <application>Phonon-backend-vlc</application> by running the following
+    <para>Install <application>Phonon-Backend-VLC</application> by running the following
     commands:</para>
 
Index: kde/core/phonon.xml
===================================================================
--- kde/core/phonon.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/phonon.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="phonon" xreflabel="phonon-&phonon-version;">
+<sect1 id="phonon" xreflabel="Phonon-&phonon-version;">
   <?dbhtml filename="phonon.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="phonon">
-    <primary sortas="a-phonon">phonon</primary>
+    <primary sortas="a-Phonon">Phonon</primary>
   </indexterm>
 
@@ -62,6 +62,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <!--<xref linkend="automoc4"/> and-->
-      <xref linkend="glib2"/>
+      <xref linkend="cmake"/>,
+      <xref linkend="glib2"/> and
+      <xref linkend="qt4"/>
     </para>
 
@@ -84,8 +85,11 @@
     a better implementation.</para>
 
-    <note><para>If you have both Qt4 and Qt5 installed, be sure to run 
-    <userinput>source setqt4</userinput> before installing Phonon.
-    </para></note>
-  
+    <para>
+      First, silence a lot of warnings caused by using the latest toolchain
+      by running the following command:
+    </para>
+
+<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake</userinput></screen>
+
     <para>Install <application>Phonon</application> by running the following
     commands:</para>
@@ -95,9 +99,8 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                               \
-      -DCMAKE_BUILD_TYPE=Release                                 \
-      -DCMAKE_INSTALL_LIBDIR=lib                                 \
-      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE        \
-      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                  \
+      -DCMAKE_BUILD_TYPE=Release                          \
+      -DCMAKE_INSTALL_LIBDIR=lib                          \
+      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
@@ -122,11 +125,4 @@
       the correct location.
     </para>
-
-    <para>
-     <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
-      This switch sets the correct installation path for the 
-      <application>D-Bus</application> interfaces file.
-    </para>
-
 <!--
     <para>
Index: kde/core/polkit-kde-agent.xml
===================================================================
--- kde/core/polkit-kde-agent.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/polkit-kde-agent.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="polkit-kde-agent" xreflabel="polkit-kde-agent-&polkit-kde-agent-version;">
+<sect1 id="polkit-kde-agent" xreflabel="Polkit-KDE-Agent-&polkit-kde-agent-version;">
   <?dbhtml filename="polkit-kde-agent.html"?>
 
@@ -21,14 +21,14 @@
   </sect1info>
 
-  <title>Polkit-kde-agent-&polkit-kde-agent-version;</title>
+  <title>Polkit-KDE-Agent-&polkit-kde-agent-version;</title>
 
   <indexterm zone="polkit-kde-agent">
-    <primary sortas="a-polkit-kde-agent">polkit-kde-agent</primary>
+    <primary sortas="a-Polkit-KDE-Agent">Polkit-KDE-Agent</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to Polkit-kde-agent</title>
+    <title>Introduction to Polkit-KDE-Agent</title>
 
-    <para><application>Polkit-kde-agent</application> provides a graphical
+    <para><application>Polkit-KDE-Agent</application> provides a graphical
     authentication prompt so non-priviledged users can authenticate themselves
     for performing administrative tasks in KDE.</para>
@@ -58,5 +58,4 @@
     </itemizedlist>
 
-
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -67,10 +66,10 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Polkit-kde-agent Dependencies</bridgehead>
+    <bridgehead renderas="sect3">Polkit-KDE-Agent Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="polkit-qt"/> and
-    <xref linkend="kdelibs"/>
+      <xref linkend="kdelibs"/> and
+      <xref linkend="polkit-qt"/>
     </para>
 
@@ -81,7 +80,7 @@
 
   <sect2 role="installation">
-    <title>Installation of Polkit-kde-agent</title>
+    <title>Installation of Polkit-KDE-Agent</title>
 
-    <para>Install <application>polkit-kde-agent</application> by running the following
+    <para>Install <application>Polkit-KDE-Agent</application> by running the following
     commands:</para>
 
@@ -116,22 +115,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-polkit-kde-agent">
-        <term><command>polkit-kde-agent</command></term>
-        <listitem>
-          <para>is a testing utility for polkit-kde-agent-generated build trees.</para>
-          <indexterm zone="a-polkit-kde-agent polkit-kde-agent">
-            <primary sortas="b-polkit-kde-agent">polkit-kde-agent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/core/polkit-qt.xml
===================================================================
--- kde/core/polkit-qt.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/polkit-qt.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="polkit-qt" xreflabel="polkit-qt-&polkit-qt-version;">
+<sect1 id="polkit-qt" xreflabel="Polkit-Qt-&polkit-qt-version;">
   <?dbhtml filename="polkit-qt.html"?>
 
@@ -24,5 +24,5 @@
 
   <indexterm zone="polkit-qt">
-    <primary sortas="a-polkit-qt">polkit-qt</primary>
+    <primary sortas="a-Polkit-Qt">Polkit-Qt</primary>
   </indexterm>
 
@@ -57,19 +57,11 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/polkit-qt-&polkit-qt-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
     <bridgehead renderas="sect3">Polkit-Qt Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <!--<xref linkend="automoc4"/> and-->
-    <xref linkend="polkit"/>
+      <xref linkend="cmake"/>,
+      <xref linkend="polkit"/> and
+      <xref linkend="qt4"/>
     </para>
 
@@ -142,22 +134,5 @@
       </seglistitem>
     </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="a-polkit-qt">
-        <term><command>polkit-qt</command></term>
-        <listitem>
-          <para>is a testing utility for polkit-qt-generated build trees.</para>
-          <indexterm zone="a-polkit-qt polkit-qt">
-            <primary sortas="b-polkit-qt">polkit-qt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
Index: kde/core/qimageblitz.xml
===================================================================
--- kde/core/qimageblitz.xml	(revision 05a9cde9470d4aa5cffa8d5acdc48fb733fbf2c3)
+++ kde/core/qimageblitz.xml	(revision dbdc2d79ce0c077e6ec6e6d8026f806d84be9247)
@@ -13,5 +13,5 @@
 ]>
 
-<sect1 id="qimageblitz" xreflabel="qimageblitz-&qimageblitz-version;">
+<sect1 id="qimageblitz" xreflabel="QImageBlitz-&qimageblitz-version;">
   <?dbhtml filename="qimageblitz.html"?>
 
@@ -21,14 +21,14 @@
   </sect1info>
 
-  <title>QImageblitz-&qimageblitz-version;</title>
+  <title>QImageBlitz-&qimageblitz-version;</title>
 
   <indexterm zone="qimageblitz">
-    <primary sortas="a-qimageblitz">qimageblitz</primary>
+    <primary sortas="a-QImageBlitz">QImageBlitz</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to QImageblitz</title>
+    <title>Introduction to QImageBlitz</title>
 
-    <para><application>QImageblitz</application> is a graphical effect and
+    <para><application>QImageBlitz</application> is a graphical effect and
     filter library for <application>KDE</application>.</para>
 
@@ -57,20 +57,10 @@
     </itemizedlist>
 
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/qimageblitz-&qimageblitz-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">QImageblitz Dependencies</bridgehead>
+    <bridgehead renderas="sect3">QImageBlitz Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="qt4"/> and
-    <xref linkend="cmake"/>
+      <xref linkend="cmake"/> and
+      <xref linkend="qt4"/>
     </para>
 
@@ -81,7 +71,7 @@
 
   <sect2 role="installation">
-    <title>Installation of QImageblitz</title>
+    <title>Installation of QImageBlitz</title>
 
-    <para>Install <application>QImageblitz</application> by running the following
+    <para>Install <application>QImageBlitz</application> by running the following
     commands:</para>
 
