Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/appendices/dependencies/common.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -1116,60 +1116,4 @@
       </segmentedlist>
 
-<!-- Begin libestr dependency info -->
-  <bridgehead renderas="sect2" id="libee-dep">Libee</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Libestr, Make, Pkg-config-lite, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin libestr dependency info -->
-  <bridgehead renderas="sect2" id="libestr-dep">Libestr</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, EGLIBC, Findutils, Gawk,
-         GCC, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Libee</seg>
-        </seglistitem>
-      </segmentedlist>
-
 <!-- Begin Libtool dependency info -->
   <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
Index: BOOK/appendices/rationale/common.xml
===================================================================
--- BOOK/appendices/rationale/common.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/appendices/rationale/common.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -228,16 +228,4 @@
 
     <listitem>
-      <para>Libee</para>
-      <para>This package contains an event expression library. It is needed by
-      Rsyslog.</para>
-    </listitem>
-
-    <listitem>
-      <para>Libestr</para>
-      <para>This package contains a library for string essentials. It is needed
-      by Rsyslog.</para>
-    </listitem>
-
-    <listitem>
       <para>Libtool</para>
       <para>The Libtool package contains the GNU generic library support
Index: BOOK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/alpha-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/common/libee.xml
===================================================================
--- BOOK/final-system/common/libee.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,91 +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="ch-system-libee" role="wrap">
-  <?dbhtml filename="libee.html"?>
-
-  <title>Libee-&libee-version;</title>
-
-  <indexterm zone="ch-system-libee">
-    <primary sortas="a-Libee">Libee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libee is an event expression library.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <para os="a">Prepare Libee for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<note os="n1">
-    <para>Libee will fail to compile if using multiple jobs with make. Append "<command>-j 1</command>" to the following make command:</para>
-</note>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libee" role="content">
-    <title>Contents of Libee</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed libraries</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>libee-convert</seg>
-        <seg>libee.[a,so]</seg>
-        <seg>/usr/include/libee</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libee-convert">
-        <term><command>libee-convert</command></term>
-        <listitem>
-          <para>todo</para>
-          <indexterm zone="ch-system-libee libee-convert">
-            <primary sortas="b-libee-convert">libee-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libee">
-        <term><filename class="libraryfile">libee</filename></term>
-        <listitem>
-          <para>is the event expression library</para>
-          <indexterm zone="ch-system-libee libee">
-            <primary sortas="c-libee">libee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/common/libestr.xml
===================================================================
--- BOOK/final-system/common/libestr.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,73 +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="ch-system-libestr" role="wrap">
-  <?dbhtml filename="libestr.html"?>
-
-  <title>Libestr-&libestr-version;</title>
-
-  <indexterm zone="ch-system-libestr">
-    <primary sortas="a-Libestr">Libestr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libestr package is a library for some string essentials.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <para os="a">Prepare Libestr for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libestr" role="content">
-    <title>Contents of Libestr</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>libestr.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libestr">
-        <term><filename class="libraryfile">libestr</filename></term>
-        <listitem>
-          <para>contains functions for aiding in string functions</para>
-          <indexterm zone="ch-system-libestr libestr">
-            <primary sortas="c-libestr">libestr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/mips-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/mips64-64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/mips64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -128,10 +128,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/final-system/multilib/libee-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libee-64bit.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,62 +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="ch-system-libee" role="wrap">
-  <?dbhtml filename="libee-64bit.html"?>
-
-  <title>Libee-&libee-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libee">
-    <primary sortas="a-Libee">Libee</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH64}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(id('contents-libee'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/libee-n32.xml
===================================================================
--- BOOK/final-system/multilib/libee-n32.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,67 +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="ch-system-libee-n32" role="wrap">
-  <?dbhtml filename="libee-n32.html"?>
-
-  <title>Libee-&libee-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libee-n32">
-    <primary sortas="a-Libee">Libee</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATHN32}" \
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libee" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/multilib/libee.xml
===================================================================
--- BOOK/final-system/multilib/libee.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,66 +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="ch-system-libee-32" role="wrap">
-  <?dbhtml filename="libee.html"?>
-
-  <title>Libee-&libee-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libee-32">
-    <primary sortas="a-Libee">Libee</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libee.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libee</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" PKG_CONFIG_PATH="${PKG_CONFIG_PATH32}" \
-  ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libee.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libee" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/multilib/libestr-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libestr-64bit.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,57 +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="ch-system-libestr" role="wrap">
-  <?dbhtml filename="libestr-64bit.html"?>
-
-  <title>Libestr-&libestr-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libestr">
-    <primary sortas="a-Libestr">Libestr</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(id('contents-libestr'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/libestr-n32.xml
===================================================================
--- BOOK/final-system/multilib/libestr-n32.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,62 +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="ch-system-libestr-n32" role="wrap">
-  <?dbhtml filename="libestr-n32.html"?>
-
-  <title>Libestr-&libestr-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libestr-n32">
-    <primary sortas="a-Libestr">Libestr</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-    --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libestr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/multilib/libestr.xml
===================================================================
--- BOOK/final-system/multilib/libestr.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ 	(revision )
@@ -1,61 +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="ch-system-libestr-32" role="wrap">
-  <?dbhtml filename="libestr.html"?>
-
-  <title>Libestr-&libestr-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libestr-32">
-    <primary sortas="a-Libestr">Libestr</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/libestr.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libestr</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/libestr.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libestr" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/ppc-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/ppc64-64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/ppc64-64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -71,6 +71,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/patch.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/ppc64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -102,8 +102,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/sparc-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/sparc64-64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/sparc64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -102,8 +102,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/x86-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -75,6 +75,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/psmisc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/systemd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/libee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/texinfo.xml"/>
Index: BOOK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/final-system/x86_64-chapter.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -102,8 +102,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/systemd-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libestr-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/libee-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/texinfo.xml"/>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/introduction/common/changelog.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>05 January 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Chris] - Removed rsyslog and its depedencies, libee and libestr.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>04 January 2014</para>
       <itemizedlist>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/materials/common/packages.xml	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -394,22 +394,4 @@
 
     <varlistentry>
-      <term>Libee (&libee-version;) - <token>&libee-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libee-home;"/></para>
-        <para>Download: <ulink url="&libee-url;"/></para>
-        <para>MD5 sum: <literal>&libee-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libestr (&libestr-version;) - <token>&libestr-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libestr-home;"/></para>
-        <para>Download: <ulink url="&libestr-url;"/></para>
-        <para>MD5 sum: <literal>&libestr-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision eb59b220ce546e195ff4b8f232167bb3496df938)
+++ BOOK/packages.ent	(revision 3941808c42dcc1a34beb8e7a4f1e21543042b875)
@@ -305,16 +305,4 @@
 <!ENTITY libcap-home "http://sites.google.com/site/fullycapable/">
 
-<!ENTITY libee-version "0.4.1">
-<!ENTITY libee-size "352 KB">
-<!ENTITY libee-url "http://www.libee.org/download/files/download/libee-&libee-version;.tar.gz">
-<!ENTITY libee-md5 "7bbf4160876c12db6193c06e2badedb2">
-<!ENTITY libee-home "http://www.libee.org/">
-
-<!ENTITY libestr-version "0.1.5">
-<!ENTITY libestr-size "326 KB">
-<!ENTITY libestr-url "http://libestr.adiscon.com/files/download/libestr-&libestr-version;.tar.gz">
-<!ENTITY libestr-md5 "f180c0cdc82883d161eba3f2e8a34eb4">
-<!ENTITY libestr-home "http://libestr.adiscon.com/">
-
 <!ENTITY libtool-version "2.4.2">
 <!ENTITY libtool-size "852 KB">
