Index: OK/final-system/common/rsyslog.xml
===================================================================
--- BOOK/final-system/common/rsyslog.xml	(revision ab628f91ef7aa8400ef1a55c66c0b48904a20404)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-rsyslog" xreflabel="rsyslog" role="wrap">
-  <?dbhtml filename="rsyslog.html"?>
-
-  <title>Rsyslog-&rsyslog-version;</title>
-
-  <indexterm zone="ch-system-rsyslog">
-    <primary sortas="a-rsyslog">rsyslog</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The rsyslog package contains programs for logging system messages,
-    such as those given by the kernel when unusual things happen.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Rsyslog</title>
-
-    <para os="a">Prepare Rsyslog 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">To test the results, issue:</para>
-
-<screen os="e2"><userinput remap="test">make check</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Create a directory for expansion snippets:</para>
-
-<screen os="i"><userinput>install -dv /etc/rsyslog.d</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-rsyslog" role="configuration">
-    <title>Configuring rsyslog</title>
-
-    <indexterm zone="conf-rsyslog">
-      <primary sortas="a-rsyslog">rsyslog</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-rsyslog">
-      <primary sortas="e-/etc/rsyslog.conf">/etc/rsyslog.conf</primary>
-    </indexterm>
-
-    <para>Create a new <filename>/etc/rsyslog.conf</filename> file by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/rsyslog.conf &lt;&lt; "EOF"
-<literal># Begin /etc/rsyslog.conf
-
-# CLFS configuration of rsyslog. For more info use man rsyslog.conf
-
-#######################################################################
-# Rsyslog Modules
-
-# Support for Local System Logging
-$ModLoad imuxsock.so
-
-# Support for Kernel Logging
-$ModLoad imklog.so
-
-#######################################################################
-# Global Options
-
-# Use traditional timestamp format.
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# Set the default permissions for all log files.
-$FileOwner root
-$FileGroup root
-$FileCreateMode 0640
-$DirCreateMode 0755
-
-# Provides UDP reception
-$ModLoad imudp
-$UDPServerRun 514
-
-# Disable Repeating of Entries
-$RepeatedMsgReduction on
-
-#######################################################################
-# Include Rsyslog Config Snippets
-
-$IncludeConfig /etc/rsyslog.d/*.conf
-
-#######################################################################
-# Standard Log Files
-
-auth,authpriv.*			/var/log/auth.log
-*.*;auth,authpriv.none		-/var/log/syslog
-daemon.*			-/var/log/daemon.log
-kern.*				-/var/log/kern.log
-lpr.*				-/var/log/lpr.log
-mail.*				-/var/log/mail.log
-user.*				-/var/log/user.log
-
-# Catch All Logs
-*.=debug;\
-	auth,authpriv.none;\
-	news.none;mail.none	-/var/log/debug
-*.=info;*.=notice;*.=warn;\
-	auth,authpriv.none;\
-	cron,daemon.none;\
-	mail,news.none		-/var/log/messages
-
-# Emergencies are shown to everyone
-*.emerg				*
-
-# End /etc/rsyslog.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-rsyslog" role="content">
-    <title>Contents of rsyslog</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>rsyslogd</seg>
-        <seg>/usr/lib/rsyslog</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rsyslogd">
-        <term><command>rsyslogd</command></term>
-        <listitem>
-          <para>Logs the messages that system programs offer for logging.
-          Every logged message contains at least a date stamp and a hostname,
-          and normally the program's name too, but that depends on how
-          trusting the logging daemon is told to be.</para>
-          <indexterm zone="ch-system-rsyslog rsyslogd">
-            <primary sortas="b-rsyslogd">rsyslogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/rsyslog.xml
===================================================================
--- BOOK/final-system/multilib/rsyslog.xml	(revision ab628f91ef7aa8400ef1a55c66c0b48904a20404)
+++ 	(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-rsyslog" xreflabel="rsyslog" role="wrap">
-  <?dbhtml filename="rsyslog.html"?>
-
-  <title>Rsyslog-&rsyslog-version;</title>
-
-  <indexterm zone="ch-system-rsyslog">
-    <primary sortas="a-rsyslog">rsyslog</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Rsyslog</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.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/rsyslog.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/rsyslog.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(id('conf-rsyslog'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/rsyslog.xml"
-  xpointer="xpointer(id('contents-rsyslog'))"/>
-
-</sect1>
Index: BOOK/final-system/multilib/systemd.xml
===================================================================
--- BOOK/final-system/multilib/systemd.xml	(revision ab628f91ef7aa8400ef1a55c66c0b48904a20404)
+++ BOOK/final-system/multilib/systemd.xml	(revision b7f960f6dbed9edd7c9dc0770d08deac8223bc4a)
@@ -38,8 +38,7 @@
   ./configure --prefix=/usr \
     --sysconfdir=/etc --localstatedir=/var \
-    --with-rootdir= --with-distro=other \
-    --with-syslog-service=rsyslog.service \
-    --with-sysvinit-path=/etc/init.d \
-    --with-sysvrcd-path=/etc/rc.d</userinput></screen>
+    --libexecdir=/usr/lib --docdir=/usr/share/doc/systemd-&systemd-version; \
+    --with-rootprefix="" --with-rootlibdir=/lib \
+    --enable-split-usr --disable-gudev</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
