diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:18:43 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-02 17:18:43 +0200 |
| commit | 90ed676c54c05cc87f0dbde96447abc8efc166d8 (patch) | |
| tree | 06bba2fa1e6fd8e5ed70c13657f8c17ccd07a65a /doc/manual.html | |
| parent | e9c659c1578a114fa6e0d9cdf2729b60ba078a91 (diff) | |
| parent | b37a1eb0f8422102c11c597f15139d64c2d51c13 (diff) | |
| download | rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.gz rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.tar.xz rsyslog-90ed676c54c05cc87f0dbde96447abc8efc166d8.zip | |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 1c0e6775..2af2e564 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -52,6 +52,7 @@ generic syslog application design</a><!-- not good as it currently is ;) <li><a <li><a href="build_from_repo.html">obtaining rsyslog from the source repository</a></li> <li><a href="ipv6.html">rsyslog and IPv6</a> (which is fully supported)</li> <li><a href="rsyslog_secure_tls.html">native TLS encryption for syslog</a></li> +<li><a href="multi_ruleset.html">using multiple rule sets in rsyslog</a></li> <li><a href="rsyslog_stunnel.html">ssl-encrypting syslog with stunnel</a></li> <li><a href="rsyslog_mysql.html">writing syslog messages to MySQL (and other databases as well)</a></li> <li><a href="rsyslog_high_database_rate.html">writing massive amounts of syslog messages to a database</a></li> |