diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-01 15:09:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-01 15:09:07 +0200 |
| commit | 4fd98529572b57f494597a34f04ced96ef1031a2 (patch) | |
| tree | a2abace73c6cfcfa9db49d4c04ed2a1e831cef74 /doc/manual.html | |
| parent | 78543b7e31ea9559108d15fd645862db7dd63913 (diff) | |
| parent | a16cbe655541421fefdcc852087219228bbc5c94 (diff) | |
| download | rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.gz rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.xz rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
conf.c
doc/Makefile.am
doc/manual.html
omfwd.c
plugins/omgssapi/omgssapi.c
This was a bit hard to merge; if there are problems, they
may be in the area of the new "comment in action line" code
that came from the beta.
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/doc/manual.html b/doc/manual.html index 1c0ffa7d..d1b670aa 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -50,15 +50,12 @@ modules</a></li><li><a href="man_rsyslogd.html">rsyslogd man page</a> <p><b>We have some in-depth papers on</b></p> <ul> <li><a href="install.html">installing rsyslog</a></li> -<li><a href="ipv6.html">rsyslog and IPv6</a> -(which is fully supported)</li> +<li><a href="ipv6.html">rsyslog and IPv6</a> (which is fully supported)</li> <li><a href="rsyslog_tls.html">native TLS encryption for syslog</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> +<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> +<li><a href="rsyslog_reliable_forwarding.html">reliable forwarding to a remote server</a></li> <li><a href="rsyslog_php_syslog_ng.html">using php-syslog-ng with rsyslog</a></li> <li><a href="rsyslog_recording_pri.html">recording @@ -67,7 +64,7 @@ the syslog priority (severity and facility) to the log file</a></li> syslog sender over NAT</a> (online only)</li> <li><a href="gssapi.html">an overview and howto of rsyslog gssapi support</a></li> <li><a href="debug.html">debug support in rsyslog</a></li> -<li><a href="dev_queue.html">the rsyslog message queue object</a></li> +<li><a href="dev_queue.html">the rsyslog message queue object (developer's view)</a></li> </ul> <p>Our <a href="history.html">rsyslog history</a> page is for you if you would like to learn a little more |