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/rsyslog_stunnel.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/rsyslog_stunnel.html')
-rw-r--r-- | doc/rsyslog_stunnel.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/rsyslog_stunnel.html b/doc/rsyslog_stunnel.html index 104a672e..1d024934 100644 --- a/doc/rsyslog_stunnel.html +++ b/doc/rsyslog_stunnel.html @@ -22,7 +22,7 @@ a peek at your data.</b> In some environments, this is no problem at all. In others, it is a huge setback, probably even preventing deployment of syslog solutions. Thankfully, there is an easy way to encrypt syslog communication. I will describe one approach in this paper.</p> -<p>The most straigthforward solution would be that the syslogd itself encrypts +<p>The most straightforward solution would be that the syslogd itself encrypts messages. Unfortuantely, encryption is only standardized in <a href="http://www.monitorware.com/Common/en/glossary/rfc3195.php">RFC 3195</a>. But there is currently no syslogd that implements RFC 3195's encryption features, @@ -237,4 +237,4 @@ comments or find bugs (I *do* bugs - no way... ;)), please <a href="http://www.gnu.org/copyleft/fdl.html"> http://www.gnu.org/copyleft/fdl.html</a>.</p> -</body></html>
\ No newline at end of file +</body></html> |