Index: chapter06/chapter06.xml
===================================================================
--- chapter06/chapter06.xml	(revision 90d417240fc72c7d7fb996af2f3bf96450b9cb2f)
+++ chapter06/chapter06.xml	(revision 7b409b74d15cc3283e9cfe278d910eb1923d745d)
@@ -63,6 +63,5 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="psmisc.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="shadow.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libol.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="syslogng.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sysklogd.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sysvinit.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="tar.xml"/>
Index: chapter06/libol.xml
===================================================================
--- chapter06/libol.xml	(revision 90d417240fc72c7d7fb996af2f3bf96450b9cb2f)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-libol" xreflabel="Libol" role="wrap">
-<title>Libol-&libol-version;</title>
-<?dbhtml filename="libol.html"?>
-
-<indexterm zone="ch-system-libol"><primary sortas="a-Libol">Libol</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Libol package contains support libraries needed by Syslog-ng.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>Unchecked</seg><seg>Unchecked</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Unchecked</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Libol</title>
-
-<para>Prepare Libol for compilation</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
-
-<sect2 id="contents-libol" role="content"><title>Contents of Libol</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>Unchecked</seg></seglistitem>
-</segmentedlist>
-
-<!--
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="klogd">
-<term><command>klogd</command></term>
-<listitem>
-<indexterm zone="ch-system-sysklogd klogd"><primary sortas="b-klogd">klogd</primary></indexterm>
-<para>is a system daemon for intercepting and logging kernel messages.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry id="syslogd">
-<term><command>syslogd</command></term>
-<listitem>
-<indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
-<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>
-</listitem>
-</varlistentry>
-</variablelist>
--->
-
-</sect2>
-
-</sect1>
Index: chapter06/sysklogd.xml
===================================================================
--- chapter06/sysklogd.xml	(revision 90d417240fc72c7d7fb996af2f3bf96450b9cb2f)
+++ chapter06/sysklogd.xml	(revision 7b409b74d15cc3283e9cfe278d910eb1923d745d)
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
@@ -21,5 +21,6 @@
 
 <segmentedlist>
-<segtitle>Sysklogd installation depends on</segtitle>
+<segtitle>&dependencies;</segtitle>
+<!-- <segtitle>Sysklogd installation depends on</segtitle> -->
 <seglistitem><seg>Binutils, Coreutils, GCC, Glibc, Make</seg></seglistitem>
 </segmentedlist>
@@ -29,20 +30,14 @@
 <title>Installation of Sysklogd</title>
 
-<para>Sysklogd has issues with the Linux 2.6 kernel series - fix these isues
-by applying the following patch:</para>
+<para>The following patch fixes various issues, including a problem building
+Sysklogd with Linux 2.6 series kernels</para>
 
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-kernel_headers-1.patch</userinput></screen>
+<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-fixes-1.patch</userinput></screen>
 
-<para>There is also a race condition in the signal handling logic, and this
-sometimes confuses the <command>sysklogd</command> initscript.
-Fix this bug by applying another patch:</para>
-
-<screen><userinput>patch -Np1 -i ../sysklogd-&sysklogd-version;-signal-1.patch</userinput></screen>
-
-<para>Compile Sysklogd:</para>
+<para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>
 
-<para>Now install it:</para>
+<para>Install the package:</para>
 
 <screen><userinput>make install</userinput></screen>
@@ -72,4 +67,7 @@
 *.emerg *
 
+# log the bootscript output:
+local2.* -/var/log/boot.log
+
 # End /etc/syslog.conf
 EOF</userinput></screen>
@@ -85,5 +83,7 @@
 </segmentedlist>
 
-<variablelist><title>Short descriptions</title>
+<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
+<?dbhtml list-presentation="table"?>
 
 <varlistentry id="klogd">
@@ -99,8 +99,8 @@
 <listitem>
 <indexterm zone="ch-system-sysklogd syslogd"><primary sortas="b-syslogd">syslogd</primary></indexterm>
-<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>
+<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>
 </listitem>
 </varlistentry>
Index: chapter06/syslogng.xml
===================================================================
--- chapter06/syslogng.xml	(revision 90d417240fc72c7d7fb996af2f3bf96450b9cb2f)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-syslogng" xreflabel="Syslog-ng" role="wrap">
-<title>Syslog-ng-&syslog-ng-version;</title>
-<?dbhtml filename="syslogng.html"?>
-
-<indexterm zone="ch-system-syslogng"><primary sortas="a-Syslogng">Syslog-ng</primary></indexterm>
-
-<sect2 role="package"><title/>
-<para>The Syslog-ng package contains programs for logging system messages, such
-as those given by the kernel when unusual things happen.</para>
-
-<segmentedlist>
-<segtitle>&buildtime;</segtitle>
-<segtitle>&diskspace;</segtitle>
-<seglistitem><seg>Unchecked</seg><seg>Unchecked</seg></seglistitem>
-</segmentedlist>
-
-<segmentedlist>
-<segtitle>&dependencies;</segtitle>
-<seglistitem><seg>Unchecked</seg></seglistitem>
-</segmentedlist>
-</sect2>
-
-<sect2 role="installation">
-<title>Installation of Syslog-ng</title>
-
-<para>Prepare Syslog-ng for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
-
-<para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-<para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-</sect2>
-
-
-<sect2 id="conf-syslogng" role="configuration"><title>Configuring Syslog-ng</title>
-<indexterm zone="conf-syslogng">
-<primary sortas="a-Syslogng">Syslog-ng</primary>
-<secondary>configuring</secondary></indexterm>
-
-<indexterm zone="conf-syslogng"><primary sortas="e-/etc/syslog-ng/syslog-ng.conf">/etc/syslog-ng/syslog-ng.conf</primary></indexterm>
-
-<para>Create a new <filename>/etc/syslog-ng/syslog-ng.conf</filename> file by
-running the following:</para>
-
-<screen><userinput>mkdir -p /etc/syslog-ng
-cat &gt; /etc/syslog-ng/syslog-ng.conf &lt;&lt; "EOF"
-<literal># Begin /etc/syslog-ng/syslog-ng.conf
-
-options { 	sync (0);
-		time_reopen (10);
-		log_fifo_size (1000);
-		long_hostnames(off); 
-		use_dns (no);
-		use_fqdn (no);
-		create_dirs (no);
-		keep_hostname (yes);
-	};
-
-source src {	unix-stream("/dev/log");
-		internal();
-		pipe("/proc/kmsg");
-	    };
-
-destination authlog { file("/var/log/authorize.log"); };
-destination syslog { file("/var/log/syslog.log"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kernel { file("/var/log/kernel.log"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-destination mail { file("/var/log/mail.log"); };
-destination news { file("/var/log/news.log"); };
-destination debug { file("/var/log/debug.log"); };
-destination messages { file("/var/log/messages.log"); };
-destination everything { file("/var/log/everything.log"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kernel { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_news { facility(news); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news); };
-filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
-
-filter f_emergency { level(emerg); };
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(src); filter(f_kernel); destination(kernel); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_news); destination(news); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-log { source(src); filter(f_everything); destination(everything); };
-log { source(src); destination(console_all); };
-
-# END /etc/syslog-ng/syslog-ng.conf</literal>
-EOF</userinput></screen>
-
-</sect2>
-
-<sect2 id="contents-syslogng" role="content"><title>Contents of Syslog-ng</title>
-
-<segmentedlist>
-<segtitle>Installed programs</segtitle>
-<seglistitem><seg>Unchecked</seg></seglistitem>
-</segmentedlist>
-
-<variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
-<?dbfo list-presentation="list"?>
-<?dbhtml list-presentation="table"?>
-
-<varlistentry id="syslog-ng">
-<term><command>syslog-ng</command></term>
-<listitem>
-<indexterm zone="ch-system-syslogng"><primary sortas="b-syslog-ng">syslog-ng</primary></indexterm>
-<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>
-</listitem>
-
-</varlistentry>
-</variablelist>
-
-</sect2>
-
-</sect1>
