Merge branch 'v4-stable' into 'v5-beta'

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	tools/syslogd.c

2 files changed, 10 insertions, 7 deletions

diff --git a/doc/manual.html b/doc/manual.html
index 936d45b5..ddfcb253 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -47,6 +47,7 @@ if you do not read the doc, but doing so will definitely improve your experience
 <li><a href="generic_design.html">backgrounder on generic syslog application design</a></li>
 <li><a href="modules.html">description of rsyslog modules</a></li>
 <li><a href="rsyslog_packages.html">rsyslog packages</a></li>
+<li><a href="http://cookbook.rsyslog.com">the rsyslog "cookbook"</a> - a set of configurations ready to use</li>
 </ul>
 <p><b>We have some in-depth papers on</b></p>
 <ul>
diff --git a/doc/rsyslog_php_syslog_ng.html b/doc/rsyslog_php_syslog_ng.html
index bf48a1eb..ed4d72fc 100644
--- a/doc/rsyslog_php_syslog_ng.html
+++ b/doc/rsyslog_php_syslog_ng.html
@@ -7,8 +7,10 @@
 		<P><small><i>Written by
 		<a href="http://www.adiscon.com/en/people/rainer-gerhards.php">Rainer 
 		Gerhards</a> (2005-08-04)</i></small></P>
-<p><b>Note: it has been reported that this guide is somewhat outdated. Please 
-use with care. </b></p>
+<p>Note: it has been reported that this guide is somewhat outdated. Please 
+use with care. Also, please note that <b>rsyslog's "native" web frontend is
+<a href="http://www.phplogcon.org">phpLogCon</a></b>, which provides best integration
+and a lot of extra functionality.</p>
 <h2>Abstract</h2>
 <p><i><b>In this paper, I describe how to use
 <a href="http://www.vermeer.org/projects/php-syslog-ng">php-syslog-ng</a> with
@@ -116,11 +118,11 @@ those unfamiliar with syslog-ng, this configuration is probably easier to set up
 then switching to syslog-ng. For existing rsyslogd users, php-syslog-ng might be a nice 
 add-on to their logging infrastructure.</P>
 <P>Please note that the <a href="http://www.monitorware.com/en/">MonitorWare family</a> (to which rsyslog belongs) also 
-offers a web-interface: <a href="http://www.phplogcon.org/">phpLogCon</a>. At the time of this writing, phpLogCon's code 
-is by far not as clean as I would like it to be. Also the user-interface is 
-definitely not as intutive as pp-syslog-ng. From a functionality point of view, 
-however, I think it already is a bit ahead. So you might 
-consider using it. I have set up a <a href="http://demo.rsyslog.com/">demo server</a>., 
+offers a web-interface: <a href="http://www.phplogcon.org/">phpLogCon</a>.
+From my point of view, obviously, <b>phpLogCon is the more natural choice for a web interface
+to be used together with rsyslog</b>. It also offers superb functionality and provides,
+for example,native display of Windows event log entries.
+I have set up a <a href="http://demo.phplogcon.org/">demo server</a>., 
 You can have a peek at it 
 without installing anything.</P>
 <h2>Feedback Requested</h2>