diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-24 11:04:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-24 11:04:46 +0100 |
| commit | ff0f04561286ba3635f128083b46501831368701 (patch) | |
| tree | 70f79d74141338cf828af122827f9367cdbb6d44 /doc/manual.html | |
| parent | acebcd793e4898b524a9ea13b96c491aee4d67e2 (diff) | |
| parent | 605701700a8914ebaff283193756a6e57d7d575b (diff) | |
| download | rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.gz rsyslog-ff0f04561286ba3635f128083b46501831368701.tar.xz rsyslog-ff0f04561286ba3635f128083b46501831368701.zip | |
Merge branch 'v4-beta' into master
Conflicts:
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 887d98d6..bcdd64cf 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> |