diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-03-11 15:15:34 +0100 |
| commit | ae7a01e137f14055f9472408d0cf3ebf9893afba (patch) | |
| tree | 37af475499d6dd82b986f34c4a53db2ecbd071bd /doc/manual.html | |
| parent | 24a36fd14226ccf5f139c07252f05f3db124604e (diff) | |
| parent | 7f43af08fec0824c30c5bb1ddb9b96427828c987 (diff) | |
| download | rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.gz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.xz rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/manual.html')
| -rw-r--r-- | doc/manual.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/manual.html b/doc/manual.html index ea7bc96c..87e3d1ed 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -48,7 +48,7 @@ generic syslog application design</a><!-- not good as it currently is ;) <li><a <li><a href="install.html">installing rsyslog</a></li> <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_tls.html">native TLS encryption for syslog</a></li> +<li><a href="rsyslog_secure_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> |