Index: xfce/core/core.xml
===================================================================
--- xfce/core/core.xml	(revision 1d128a6928689fc3c21789b52325fb849252b409)
+++ xfce/core/core.xml	(revision d43c7a124fc67f42d0a2eab129a9dd622daebf46)
@@ -40,9 +40,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="garcon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-xfce-engine.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck2.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-xfce-engine.xml"/>-->
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwnck2.xml"/>-->
   <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxfcegui4.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-panel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-xkb-plugin.xml"/>
+  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xfce4-xkb-plugin.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="thunar-volman.xml"/>
Index: xfce/core/gtk-xfce-engine.xml
===================================================================
--- xfce/core/gtk-xfce-engine.xml	(revision 1d128a6928689fc3c21789b52325fb849252b409)
+++ 	(revision )
@@ -1,180 +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 gtk-xfce-engine-download-http
-           "http://archive.xfce.org/src/archive/gtk-xfce-engine/3.2/gtk-xfce-engine-&gtk-xfce-engine-version;.tar.bz2">
-  <!ENTITY gtk-xfce-engine-download-ftp  " ">
-  <!ENTITY gtk-xfce-engine-md5sum        "363d6c16a48a00e26d45c45c2e1fd739">
-  <!ENTITY gtk-xfce-engine-size          "368 KB">
-  <!ENTITY gtk-xfce-engine-buildsize     "7.0 MB">
-  <!ENTITY gtk-xfce-engine-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="gtk-xfce-engine" xreflabel="gtk-xfce-engine-&gtk-xfce-engine-version;">
-  <?dbhtml filename="gtk-xfce-engine.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>gtk-xfce-engine-&gtk-xfce-engine-version;</title>
-
-  <indexterm zone="gtk-xfce-engine">
-    <primary sortas="a-gtk-xfce-engine">gtk-xfce-engine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK Xfce Engine</title>
-
-    <para>
-      The <application>GTK Xfce Engine</application> package contains several
-      <application>GTK+ 2</application> and <application>GTK+ 3</application>
-      themes and libraries needed to display them.
-      This is useful for customising the appearance of your
-      <application>Xfce</application> desktop.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-xfce-engine-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-xfce-engine-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-xfce-engine-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-xfce-engine-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-xfce-engine-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-xfce-engine-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK Xfce Engine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gtk-xfce-engine"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK Xfce Engine</title>
-
-    <para>
-      Install <application>GTK Xfce Engine</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's/\xd6/\xc3\x96/' gtk-3.0/xfce_style_types.h &amp;&amp;
-./configure --prefix=/usr --enable-gtk3              &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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/\xd6/\xc3\x96/' ...</command>: The script
-      <command>glib-mkenums</command> has now been rewritten from
-      <application>perl</application> to <application>python</application>
-      and will crash when it encounters an ISO-8859-1 character in a comment.
-      This sed converts that character to UTF-8.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libxfce.so (in /usr/lib/gtk-&gtk2-libdir;/engines,
-          /usr/lib/gtk-3.0/3.0.0/theming-engines), and
-          /usr/share/themes/Xfce* (21 variations)
-        </seg>
-        <seg>
-          Xfce, Xfce-4.0, Xfce-4.2, Xfce-4.4, Xfce-4.6, Xfce-b5, Xfce-basic,
-          Xfce-cadmium, Xfce-curve, Xfce-dawn, Xfce-dusk, Xfce-kde2,
-          Xfce-kolors, Xfce-light, Xfce-orange, Xfce-redmondxp, Xfce-saltlake,
-          Xfce-smooth, Xfce-stellar, Xfce-winter in /usr/share/themes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxfce">
-        <term><filename class="libraryfile">libxfce.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow <application>Xfce</application> to
-            apply and change <application>GTK+ 2</application> and
-            <application>GTK+ 3</application> themes.
-          </para>
-          <indexterm zone="gtk-xfce-engine libxfce">
-            <primary sortas="c-libxfce">libxfce.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/libwnck2.xml
===================================================================
--- xfce/core/libwnck2.xml	(revision 1d128a6928689fc3c21789b52325fb849252b409)
+++ 	(revision )
@@ -1,202 +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 libwnck2-download-http
-           "&gnome-download-http;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
-  <!ENTITY libwnck2-download-ftp
-           "&gnome-download-ftp;/libwnck/2.30/libwnck-&libwnck2-version;.tar.xz">
-  <!ENTITY libwnck2-md5sum        "3d20f26105a2fd878899d6ecdbe9a082">
-  <!ENTITY libwnck2-size          "612 KB">
-  <!ENTITY libwnck2-buildsize     "16 MB">
-  <!ENTITY libwnck2-time          "0.2 SBU">
-]>
-
-<sect1 id="libwnck2" xreflabel="libwnck-&libwnck2-version;">
-  <?dbhtml filename="libwnck2.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libwnck-&libwnck2-version;</title>
-
-  <indexterm zone="libwnck2">
-    <primary sortas="a-libwnck-2">libwnck 2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwnck</title>
-
-    <para>
-      The <application>libwnck</application> package contains a Window Navigator
-      Construction Kit.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwnck2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwnck2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwnck2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwnck2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwnck2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwnck2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwnck Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="startup-notification"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libwnck2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwnck</title>
-
-    <para>
-      Install <application>libwnck</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --disable-static \
-            --program-suffix=-1 &amp;&amp;
-make GETTEXT_PACKAGE=libwnck-1</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 GETTEXT_PACKAGE=libwnck-1 install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--program-suffix=-1</parameter>: This option adds -1 to the
-      end of the names of the installed programs to avoid overwriting the
-      programs installed by <xref linkend="libwnck"/>.
-    </para>
-
-    <para>
-      <parameter>GETTEXT_PACKAGE=libwnck-1</parameter>: This parameter adds -1
-      to the end of the names of the gettext files installed by the package
-      to avoid overwriting the files installed by <xref linkend="libwnck"/>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wnckprop-1 and wnck-urgency-monitor-1
-        </seg>
-        <seg>
-          libwnck-1.so
-        </seg>
-        <seg>
-          /usr/include/libwnck-1.0 and
-          /usr/share/gtk-doc/html/libwnck-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wnckprop-1">
-        <term><command>wnckprop-1</command></term>
-        <listitem>
-          <para>
-            Prints, modifies, or interacts with  the properties of a 
-            screen/workspace/window.
-          </para>
-          <indexterm zone="libwnck2 wnckprop-1">
-            <primary sortas="b-wnckprop-1">wnckprop-1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwnck-1">
-        <term><filename class="libraryfile">libwnck-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for writing pagers and task lists.
-          </para>
-          <indexterm zone="libwnck2 libwnck-1">
-            <primary sortas="c-libwnck-1">libwnck-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: xfce/core/xfce4-xkb-plugin.xml
===================================================================
--- xfce/core/xfce4-xkb-plugin.xml	(revision 1d128a6928689fc3c21789b52325fb849252b409)
+++ 	(revision )
@@ -1,185 +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 xfce4-xkb-plugin-download-http
-           "http://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.7/xfce4-xkb-plugin-&xfce4-xkb-plugin-version;.tar.bz2">
-  <!ENTITY xfce4-xkb-plugin-download-ftp  " ">
-  <!ENTITY xfce4-xkb-plugin-md5sum        "2f68e0d53baf68ecc1a7165ad33c26a9">
-  <!ENTITY xfce4-xkb-plugin-size          "820 KB">
-  <!ENTITY xfce4-xkb-plugin-buildsize     "7.8 MB">
-  <!ENTITY xfce4-xkb-plugin-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xfce4-xkb-plugin" xreflabel="xfce4-xkb-plugin-&xfce4-xkb-plugin-version;">
-  <?dbhtml filename="xfce4-xkb-plugin.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>xfce4-xkb-plugin-&xfce4-xkb-plugin-version;</title>
-
-  <indexterm zone="xfce4-xkb-plugin">
-    <primary sortas="a-xfce4-xkb-plugin">xfce4-xkb-plugin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Xfce4 Keyboard Plugin</title>
-
-    <para>
-      If your system has a standard (US) keyboard, you probably do not need to
-      install this plugin.
-    </para>
-
-    <para>
-      The <application>Xfce4 Keyboard Plugin</application> package contains a
-      very customizable and useful <application>Xfce4</application> Panel
-      plugin to setup and use multiple (currently up to 4 due to X11 protocol
-      limitation) keyboard layouts and switch between them, individually by
-      application, individually by window, or globally for the desktop and all
-      applications and windows.
-    </para>
-
-    &lfs84_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xfce4-xkb-plugin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xfce4-xkb-plugin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xfce4-xkb-plugin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xfce4-xkb-plugin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xfce4-xkb-plugin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xfce4-xkb-plugin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xfce4 Keyboard Plugin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxklavier"/>, and
-      <xref linkend="xfce4-panel"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/xfce4-xkb-plugin"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xfce4 Keyboard Plugin</title>
-
-    <para>
-      Install <application>Xfce4 Keyboard Plugin</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -e 's|xfce4/panel-plugins|xfce4/panel/plugins|' \
-    -i panel-plugin/{Makefile.in,xkb-plugin.desktop.in.in} &amp;&amp;
-
-./configure --prefix=/usr         \
-            --libexecdir=/usr/lib \
-            --disable-debug       &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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -e ... xkb-plugin.desktop.in.in}</command> and
-      <parameter>--libexecdir=/usr/lib</parameter>: The sed and the
-      switch are necessary to place the xkb-plugin in the default
-      Xfce4 panel plugins directory.
-    </para>
-
-    <para>
-      <parameter>--disable-debug</parameter>: This switch disables debugging
-      support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          xfce4-xkb-plugin
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xfce4/xkb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xfce4-xkb-plugin-prog">
-        <term><command>xfce4-xkb-plugin</command></term>
-        <listitem>
-          <para>
-            is the <application>Xfce</application> keyboard layout plugin.
-          </para>
-          <indexterm zone="xfce4-xkb-plugin xfce4-xkb-plugin-prog">
-            <primary sortas="b-xfce4-xkb-plugin">xfce4-xkb-plugin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
