diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:42:21 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:42:21 +0100 |
commit | 0995bff5947340333466cf3ac9c6a6b403b32d18 (patch) | |
tree | 0e19cbbd0f63005497b1dbe08779f2947b6eca22 /doc/manual.html | |
parent | c8ebe623376bc025bf166ec333ac874c215de816 (diff) | |
parent | 76ded5e98bd51d5de306f21f8abd28ee3b006be2 (diff) | |
download | rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.tar.gz rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.tar.xz rsyslog-0995bff5947340333466cf3ac9c6a6b403b32d18.zip |
Merge branch 'v4-stable' into 'v5-beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tools/syslogd.c
Diffstat (limited to 'doc/manual.html')
-rw-r--r-- | doc/manual.html | 1 |
1 files changed, 1 insertions, 0 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> |