Index: archive/kde/intro/introduction.xml
===================================================================
--- archive/kde/intro/introduction.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ archive/kde/intro/introduction.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,25 @@
+<?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="kde-prereq">
+  <?dbhtml filename="introduction.html"?>
+
+  <title>Introduction</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extra-cmake-modules.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-gstreamer.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-vlc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
+
+</chapter>
Index: archive/kde/intro/kde-intro.xml
===================================================================
--- archive/kde/intro/kde-intro.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ archive/kde/intro/kde-intro.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE partintro 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-intro">
+  <?dbhtml filename="kdeintro.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Introduction to KDE</title>
+
+  <para><application>KDE</application> is a comprehensive desktop environment
+  with a huge number of applications written for it and a huge amount of users.
+  It is based on the <application>Qt</application> framework.</para>
+
+  <para>There are two versions of <application>KDE</application>. KDE4
+  is a mature version that combines libraries and the desktop environment
+  into one set of packages and has numerous appplications that can be
+  built on that base.  For KDE5, the libraries, now called KDE Frameworks
+  5 or KF5, are separate from the desktop environment called KDE Plasma 5.
+  Both envionments can be installed, but Plasma is not yet considered 
+  stable.</para>
+
+  <para>For more information visit the official KDE project site at
+  <ulink url="http://www.kde.org/"/>.</para>
+
+  <sect2><title>Common Packages</title>
+
+  <para>There are several packages that are common to both versions of KDE.
+  These packages are presented in the following sections of this chapter.</para>
+
+  <!-- <para>The core <application>KDE</application> packages are listed in the
+  recommended and tested build order. The additional
+  <application>KDE</application> packages can be built in any order.</para>-->
+
+  </sect2>
+
+</sect1>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/add/add.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -14,5 +14,5 @@
   <?dbhtml filename="add.html"?>
 
-  <title>KDE Additional Packages</title>
+  <title>KDE4 Additional Packages</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="konsole.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kate.xml"/>
Index: kde/core/attica.xml
===================================================================
--- kde/core/attica.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/attica.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -65,11 +65,4 @@
     </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>
-
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/attica"/></para>
@@ -111,6 +104,5 @@
       <parameter>-DQT4_BUILD=ON</parameter>: This switch forces the package
       to build against <application>Qt4</application> even if
-      <application>Qt5</application> is present on the system. Remove it if
-       you want to build the package against <application>Qt5</application>.
+      <application>Qt5</application> is present on the system. 
     </para>
 
Index: kde/core/config.xml
===================================================================
--- kde/core/config.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/config.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -6,5 +6,5 @@
 ]>
 
-<sect1 id="kde-core-config" xreflabel="Starting KDE">
+<sect1 id="kde-core-config" xreflabel="Starting KDE4">
   <?dbhtml filename="config.html"?>
 
@@ -14,7 +14,7 @@
   </sect1info>
 
-  <title>Starting KDE</title>
+  <title>Starting KDE4</title>
 
-  <bridgehead renderas="sect3">KDE Startup Dependencies</bridgehead>
+  <bridgehead renderas="sect3">KDE4 Startup Dependencies</bridgehead>
 
   <bridgehead renderas="sect4">Optional</bridgehead>
@@ -25,10 +25,10 @@
   <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>
+  system to start KDE4.</para>
 
   <sect2 role="content">
-  <title>Starting KDE from the command prompt</title>
+  <title>Starting KDE4 from the command prompt</title>
 
- <para>To start <application>KDE</application> from the command prompt, you
+ <para>To start <application>KDE4</application> from the command prompt, you
  first need to modify your <filename>.xinitrc</filename> file:</para>
 
@@ -44,12 +44,12 @@
     <userinput>ck-launch-session</userinput>.</para></note>
 
-    <para>You can now start KDE using the <command>startx</command> command.</para>
+    <para>You can now start KDE4 using the <command>startx</command> command.</para>
 
     </sect2>
 
     <sect2 role="content">
-    <title>Starting KDE at boot</title>
+    <title>Starting KDE4 at boot</title>
 
-    <para>KDE comes with a graphical login interface called KDM (the KDE Display
+    <para>KDE4 comes with a graphical login interface called KDM (the KDE4 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
@@ -66,5 +66,5 @@
 <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
+    <para>You can now restart your system and see the KDE4 login
     screen.</para>
 
@@ -79,5 +79,5 @@
          &kde-download-http;applications/&kde-apps-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
+    KDE4 session when installing a new language and configure KDE4 to use it, the
     session needs to be restarted, in order to see the effects.</para>
 
@@ -85,8 +85,8 @@
 
   <sect2 role="content">
-    <title>Installing further KDE packages</title>
+    <title>Installing further KDE4 packages</title>
 
     <para>Every subsequent package can be built while having
-    <application>KDE</application> up and running, but remember to keep
+    <application>KDE4</application> up and running, but remember to keep
     <envar>&kde-dir;</envar> and <envar>&qt4-dir;</envar> set.</para>
 
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/core.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -14,6 +14,7 @@
   <?dbhtml filename="core.html"?>
 
-  <title>The KDE Core</title>
+  <title>The KDE4 Core</title>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon.xml"/>
@@ -23,5 +24,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,6 +32,4 @@
   <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"/>
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/oxygen-icons.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -75,8 +75,11 @@
     the following commands:</para>
 
+    <note><para>Unlike most packages in this section, the icons are placed
+    in /usr so other applications can find them.</para></note>
+
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev ..</userinput></screen>
+cmake -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ..</userinput></screen>
 
     <para>
Index: kde/core/phonon-backend-gstreamer.xml
===================================================================
--- kde/core/phonon-backend-gstreamer.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/phonon-backend-gstreamer.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -62,5 +62,5 @@
     <para role="required">
     <xref linkend="gstreamer10"/>,
-    <xref linkend="libxml2"/> and
+    <xref linkend="libxml2"/>, and
     <xref linkend="phonon"/>
     </para>
@@ -70,11 +70,6 @@
     <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-bad"/>  (needed for AAC/M4A support), and
     <xref linkend="gst10-plugins-ugly"/> (needed for MP3 support)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="qt5"/>
     </para>
 
@@ -87,6 +82,13 @@
     <title>Installation of Phonon-backend-gstreamer</title>
 
-    <para>Install <application>Phonon-backend-gstreamer</application> by running the following
-    commands:</para>
+    <para>Install <application>Phonon-backend-gstreamer</application> by
+    running the following commands:</para>
+
+    <note>
+      <para>
+        If you have both Qt4 and Qt5 installed, be sure to run
+        <userinput>source setqt4</userinput> before installing this package.
+      </para>
+    </note> 
 
 <screen><userinput>mkdir build &amp;&amp;
@@ -108,6 +110,6 @@
     <title>Command Explanations</title>
 
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to apply
-    higher level of compiler optimizations.</para>
+    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
+    apply higher level of compiler optimizations.</para>
 
   </sect2>
@@ -124,6 +126,6 @@
         <seg>none</seg>
         <seg>phonon_gstreamer.so</seg>
-        <seg>&kde-dir;/lib/kde4/plugins/phonon_backend and 
-        &kde-dir;/share/kde4/services/phononbackends</seg>
+        <seg>/usr/lib/kde4/plugins/phonon_backend and 
+             /usr/share/kde4/services/phononbackends</seg>
       </seglistitem>
     </segmentedlist>
Index: kde/core/phonon.xml
===================================================================
--- kde/core/phonon.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/phonon.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -31,6 +31,6 @@
 
     <para><application>Phonon</application> is the multimedia API for KDE4.
-    It replaces the old <application>aRts</application>, that is no longer
-    supported by KDE. Phonon needs either the GStreamer or VLC backend.</para>
+    It replaces the old <application>aRts</application> package.
+    Phonon needs either the GStreamer or VLC backend.</para>
 
     &lfs77_checked; &gcc5_checked;
@@ -62,14 +62,12 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <!--<xref linkend="automoc4"/> and-->
       <xref linkend="cmake"/>,
-      <xref linkend="glib2"/> and
-      <xref linkend="qt4"/>
+      <xref linkend="glib2"/>, and
+      <xref linkend="qt4"/> 
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="qt5"/> and
+      <xref linkend="pulseaudio"/> and
       <ulink url="http://projects.kde.org/projects/kdesupport/libqzeitgeist/">QZeitgeist</ulink>
     </para>
@@ -83,17 +81,22 @@
     <title>Installation of Phonon</title>
 
-    <para>Make sure that <xref linkend="qt4"/> is compiled without the bundled
+    <para>Make sure <xref linkend="qt4"/> has been built without the bundled
     <application>Phonon</application> library. This package provides
     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>
+    <note>
+      <para>
+        If you have both Qt4 and Qt5 installed, be sure to run 
+        <userinput>source setqt4</userinput> before installing Phonon.
+      </para>
+
+    </note>
   
     <para>Install <application>Phonon</application> by running the following
     commands:</para>
 
-<!-- CMAKE_INSTALL_LIBDIR is used so the package doesn't write over lib64 symlink on 64 bit system -->
-<screen><userinput>mkdir build &amp;&amp;
+<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &amp;&amp;
+
+mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
@@ -116,4 +119,9 @@
 
     <para>
+      <command>sed ... cmake/FindPhononInternal.cmake</command>: Silence
+      a lot of warnings caused by the latest toolchain.
+    </para>
+
+    <para>
       <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
       to apply higher level of the compiler optimizations.
@@ -131,13 +139,4 @@
       <application>D-Bus</application> interfaces file.
     </para>
-
-<!--
-    <para>
-      <option>-DPHONON_BUILD_PHONON4QT5=ON</option>: Use this switch if you want to
-      build <application>Phonon</application> against <application>Qt5</application>.
-      Note that both <application>Qt4</application> and <application>Qt5</application>
-      versions can be installed at the same time without any conflicts.
-    </para>
--->
 
   </sect2>
Index: kde/core/polkit-qt.xml
===================================================================
--- kde/core/polkit-qt.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/core/polkit-qt.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -90,7 +90,7 @@
 
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release       \
-      -DCMAKE_INSTALL_LIBDIR=lib       \
-      -DUSE_QT4=TRUE                   \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -DCMAKE_INSTALL_LIBDIR=lib         \
+      -DUSE_QT4=TRUE                     \
       -Wno-dev .. &amp;&amp;
 make</userinput></screen>
Index: kde/core/pre-install-config.xml
===================================================================
--- kde/core/pre-install-config.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ kde/core/pre-install-config.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,113 @@
+<?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-pre-install-config">
+  <?dbhtml filename="pre-install-config.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>KDE4 Pre-installation Configuration</title>
+
+  <note><para>If you did not install <application>Xorg</application> in
+  <filename class="directory">/usr</filename>, some of the 
+  <application>CMake</application> modules in <application>KDE</application>
+  look for packages at hard coded locations. To accommodate this issue,
+  create the following symbolic link (as the root user):</para>
+
+<screen role="root"><userinput>ln -sv $XORG_PREFIX /usr/X11R6</userinput></screen>
+  </note>
+
+  <sect2><title>Installing in /usr</title>
+
+    <para>One option is to put <application>KDE</application> into the
+    <filename class='directory'>/usr</filename> hierarchy.  This creates a
+    simpler setup but makes it more difficult to try multiple versions of
+    <application>KDE</application>.</para>
+
+<screen><userinput>export &kde-dir-var;=/usr</userinput></screen>
+  </sect2>
+
+  <sect2><title>Installing in /opt</title>
+
+    <para>A method of building multiple versions installs
+    <application>KDE</application> in the <filename
+    class='directory'>/opt</filename> hierarchy:</para>
+
+<screen><userinput>export &kde-dir-var;=/opt/kde</userinput></screen>
+
+    <para>If you are not installing <application>KDE</application> in
+    <filename class="directory">/usr</filename>, you will need to make some
+    additional configuration changes. Best practice is to add those to your
+    system or personal profile:</para>
+
+<screen><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; 'EOF'
+<literal># Begin /etc/profile.d/kde.sh
+
+&kde-dir-var;=/opt/kde
+KDEDIR=&kde-dir;
+
+pathappend &kde-dir;/bin             PATH
+pathappend &kde-dir;/lib/pkgconfig   PKG_CONFIG_PATH
+pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
+pathappend &kde-dir;/share           XDG_DATA_DIRS
+pathappend &kde-dir;/share/man       MANPATH
+pathappend /etc/kde/xdg                XDG_CONFIG_DIRS
+
+export &kde-dir-var; KDEDIR
+
+# End /etc/profile.d/kde.sh</literal>
+EOF
+</userinput></screen>
+
+    <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
+<literal># Begin kde addition
+
+/opt/kde/lib
+
+# End kde addition</literal>
+EOF</userinput></screen>
+
+    <indexterm zone="kde-pre-install-config">
+      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+    </indexterm>
+
+    <para>Several KDE packages install files into D-Bus and polkit directories.
+    When installing KDE in a location other than <filename class="directory">/usr</filename>,
+    D-Bus and polkit need to find these files. The easiest way to achieve this is to create
+    the following symlinks (as the <systemitem class="username">root</systemitem> user):</para>
+
+<screen role="root"><userinput>install -d &kde-dir;/share &amp;&amp;
+ln -svf /usr/share/dbus-1 &kde-dir;/share &amp;&amp;
+ln -svf /usr/share/polkit-1 &kde-dir;/share</userinput></screen>
+
+    <tip>
+      <para>Sometimes, the installation paths are coded into installed files.
+      This is the reason why <filename class="directory">/opt/kde</filename>
+      is used as installation prefix instead of <filename
+      class="directory">/opt/kde-&kde-version;</filename>.  After installing
+      <application>KDE</application>, you may rename the directory and create
+      a symlink:</para>
+
+<screen role="root"><userinput>mv /opt/kde{,-&kde-version;} &amp;&amp;
+ln -svf kde-&kde-version; /opt/kde</userinput></screen>
+
+      <para>Later on, you may want to install other versions of
+      <application>KDE</application>.  To do that, just remove the symlink and
+      use <filename class="directory">/opt/kde</filename> as the prefix again
+      (<application>KDE</application> must not be started). Which version of
+      <application>KDE</application> you use depends only on where the symlink
+      points to. No other reconfiguration will be needed.</para>
+
+    </tip>
+
+  </sect2>
+</sect1>
Index: e/intro/introduction.xml
===================================================================
--- kde/intro/introduction.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ 	(revision )
@@ -1,21 +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="kde-prereq">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pre-install-config.xml"/>
-
-</chapter>
Index: e/intro/kde-intro.xml
===================================================================
--- kde/intro/kde-intro.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE partintro 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-intro">
-  <?dbhtml filename="kdeintro.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Introduction to KDE</title>
-
-  <para><application>KDE</application> Software Compilation 4 is a
-  comprehensive desktop environment with a huge number of applications
-  written for it and a huge amount of users. It is based on the
-  <application>Qt</application> framework.</para>
-  <para>For more information visit the official KDE project site at
-  <ulink url="http://www.kde.org/"/>.</para>
-
-  <sect2><title>Build order</title>
-
-  <para>The core <application>KDE</application> packages are listed in the
-  recommended and tested build order. The additional
-  <application>KDE</application> packages can be built in any order.</para>
-
-  </sect2>
-
-</sect1>
Index: e/intro/pre-install-config.xml
===================================================================
--- kde/intro/pre-install-config.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ 	(revision )
@@ -1,113 +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-pre-install-config">
-  <?dbhtml filename="pre-install-config.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>KDE Pre-installation Configuration</title>
-
-  <note><para>If you did not install <application>Xorg</application> in
-  <filename class="directory">/usr</filename>, some of the 
-  <application>CMake</application> modules in <application>KDE</application>
-  look for packages at hard coded locations. To accommodate this issue,
-  create the following symbolic link (as the root user):</para>
-
-<screen role="root"><userinput>ln -sv $XORG_PREFIX /usr/X11R6</userinput></screen>
-  </note>
-
-  <sect2><title>Installing in /usr</title>
-
-    <para>One option is to put <application>KDE</application> into the
-    <filename class='directory'>/usr</filename> hierarchy.  This creates a
-    simpler setup but makes it more difficult to try multiple versions of
-    <application>KDE</application>.</para>
-
-<screen><userinput>export &kde-dir-var;=/usr</userinput></screen>
-  </sect2>
-
-  <sect2><title>Installing in /opt</title>
-
-    <para>A method of building multiple versions installs
-    <application>KDE</application> in the <filename
-    class='directory'>/opt</filename> hierarchy:</para>
-
-<screen><userinput>export &kde-dir-var;=/opt/kde</userinput></screen>
-
-    <para>If you are not installing <application>KDE</application> in
-    <filename class="directory">/usr</filename>, you will need to make some
-    additional configuration changes. Best practice is to add those to your
-    system or personal profile:</para>
-
-<screen><userinput>cat &gt; /etc/profile.d/kde.sh &lt;&lt; 'EOF'
-<literal># Begin /etc/profile.d/kde.sh
-
-&kde-dir-var;=/opt/kde
-KDEDIR=&kde-dir;
-
-pathappend &kde-dir;/bin             PATH
-pathappend &kde-dir;/lib/pkgconfig   PKG_CONFIG_PATH
-pathappend &kde-dir;/share/pkgconfig PKG_CONFIG_PATH
-pathappend &kde-dir;/share           XDG_DATA_DIRS
-pathappend &kde-dir;/share/man       MANPATH
-pathappend /etc/kde/xdg                XDG_CONFIG_DIRS
-
-export &kde-dir-var; KDEDIR
-
-# End /etc/profile.d/kde.sh</literal>
-EOF
-</userinput></screen>
-
-    <para>Add to your <filename>/etc/ld.so.conf</filename>:</para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin kde addition
-
-/opt/kde/lib
-
-# End kde addition</literal>
-EOF</userinput></screen>
-
-    <indexterm zone="kde-pre-install-config">
-      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>Several KDE packages install files into D-Bus and polkit directories.
-    When installing KDE in a location other than <filename class="directory">/usr</filename>,
-    D-Bus and polkit need to find these files. The easiest way to achieve this is to create
-    the following symlinks (as the <systemitem class="username">root</systemitem> user):</para>
-
-<screen role="root"><userinput>install -d &kde-dir;/share &amp;&amp;
-ln -svf /usr/share/dbus-1 &kde-dir;/share &amp;&amp;
-ln -svf /usr/share/polkit-1 &kde-dir;/share</userinput></screen>
-
-    <tip>
-      <para>Sometimes, the installation paths are coded into installed files.
-      This is the reason why <filename class="directory">/opt/kde</filename>
-      is used as installation prefix instead of <filename
-      class="directory">/opt/kde-&kde-version;</filename>.  After installing
-      <application>KDE</application>, you may rename the directory and create
-      a symlink:</para>
-
-<screen role="root"><userinput>mv /opt/kde{,-&kde-version;} &amp;&amp;
-ln -svf kde-&kde-version; /opt/kde</userinput></screen>
-
-      <para>Later on, you may want to install other versions of
-      <application>KDE</application>.  To do that, just remove the symlink and
-      use <filename class="directory">/opt/kde</filename> as the prefix again
-      (<application>KDE</application> must not be started). Which version of
-      <application>KDE</application> you use depends only on where the symlink
-      points to. No other reconfiguration will be needed.</para>
-
-    </tip>
-
-  </sect2>
-</sect1>
Index: kde/kde.xml
===================================================================
--- kde/kde.xml	(revision 1b0d01888a40962f2ce382c1dce3a433dd14f8a6)
+++ kde/kde.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -14,9 +14,27 @@
   <?dbhtml filename="kde.html" dir="kde"?>
 
-  <title>KDE</title>
+  <title>Introduction to KDE</title>
+<partintro>
+  <para><application>KDE</application> is a comprehensive desktop environment
+  with a huge number of applications written for it and a huge amount of users.
+  It is based on the <application>Qt</application> framework.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro/introduction.xml"/>
+  <para>There are two versions of <application>KDE</application>. KDE4
+  is a mature version that combines libraries and the desktop environment
+  into one set of packages and has numerous appplications that can be
+  built on that base.  For KDE5, the libraries, now called KDE Frameworks
+  5 or KF5, are separate from the desktop environment called KDE Plasma 5.
+  Both envionments can be installed, but Plasma is not yet considered 
+  stable.</para>
+
+  <para>For more information visit the official KDE project site at
+  <ulink url="http://www.kde.org/"/>.</para>
+</partintro>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro/introduction.xml"/>-->
   <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="kf5/kf5.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-apps/kf5-apps.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="plasma5/plasma5.xml"/>
 <!--
   Language packs!
Index: kde/kf5-apps/kf5-apps.xml
===================================================================
--- kde/kf5-apps/kf5-apps.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ kde/kf5-apps/kf5-apps.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,22 @@
+<?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: rthomsen $
+$Date: 2014-09-10 14:10:00 -0500 (Wed, 10 Sep 2014) $
+-->
+
+<chapter id="kf5-apps">
+  <?dbhtml filename="kf5-apps.html"?>
+
+  <title>KDE Frameworks 5 Based Applications</title>
+ 
+  <para>Placeholder</para>
+
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>-->
+
+</chapter>
Index: kde/kf5/extra-cmake-modules.xml
===================================================================
--- kde/kf5/extra-cmake-modules.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ kde/kf5/extra-cmake-modules.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,144 @@
+<?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 extra-cmake-modules-version       "1.7.0">
+   <!ENTITY extra-cmake-modules-download-http "&kf5-download-http;/extra-cmake-modules-&extra-cmake-modules-version;.tar.xz">
+   <!ENTITY extra-cmake-modules-download-ftp  "&kf5-download-ftp;/extra-cmake-modules-&extra-cmake-modules-version;.tar.xz">
+   <!ENTITY extra-cmake-modules-md5sum        "45fd1e6f38b23b00983e5eab9ba61d15">
+   <!ENTITY extra-cmake-modules-size          "128 KB">
+   <!ENTITY extra-cmake-modules-buildsize     "5.8 MB">
+   <!ENTITY extra-cmake-modules-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="extra-cmake-modules" xreflabel="extra-cmake-modules-&extra-cmake-modules-version;">
+  <?dbhtml filename="extra-cmake-modules.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2014-10-09 22:03:42 +0200 (Thu, 09 Oct 2014) $</date>
+  </sect1info>
+
+  <title>extra-cmake-modules-&extra-cmake-modules-version;</title>
+
+  <indexterm zone="extra-cmake-modules">
+    <primary sortas="a-extra-cmake-modules">extra-cmake-modules</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Extra Cmake Modules</title>
+
+    <para>
+      The <application>Extra Cmake Modules</application> package contains
+      extra <application>CMake</application> modules used by 
+      <application>KDE Frameworks 5</application> and other packages.
+    </para>
+
+    &lfs77_checked;
+    
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&extra-cmake-modules-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&extra-cmake-modules-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &extra-cmake-modules-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &extra-cmake-modules-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &extra-cmake-modules-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &extra-cmake-modules-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Extra Cmake Modules Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx (for building documentation)</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/extra-cmake-modules"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Extra Cmake Modules</title>
+
+    <para>
+      Install <application>Extra Cmake Modules</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          /usr/share/ECM and
+          /usr/share/doc/ECM (if documentation was built)
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
+
+
Index: kde/kf5/kf5.xml
===================================================================
--- kde/kf5/kf5.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ kde/kf5/kf5.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,22 @@
+<?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: rthomsen $
+$Date: 2014-09-10 14:10:00 -0500 (Wed, 10 Sep 2014) $
+-->
+
+<chapter id="kf5">
+  <?dbhtml filename="kf5.html"?>
+
+  <title>KDE Frameworks 5</title>
+ 
+  <para>Placeholder</para>
+
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>-->
+
+</chapter>
Index: kde/plasma5/plasma5.xml
===================================================================
--- kde/plasma5/plasma5.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
+++ kde/plasma5/plasma5.xml	(revision 8e6f4f855f137baf38a3bb130b96d5cd178b91c4)
@@ -0,0 +1,22 @@
+<?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: rthomsen $
+$Date: 2014-09-10 14:10:00 -0500 (Wed, 10 Sep 2014) $
+-->
+
+<chapter id="plasma5">
+  <?dbhtml filename="plasma5.html"?>
+
+  <title>KDE Plasma 5</title>
+ 
+  <para>Placeholder</para>
+
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="automoc4.xml"/>-->
+
+</chapter>
