summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_stunnel.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:16:57 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:16:57 +0100
commit4df8bb4e6b6c8183c504fdb31d667717bf7584e5 (patch)
treea707a3ea82a3bdefd91ecea44ed7e119b43d496f /doc/rsyslog_stunnel.html
parentdd19c937c1bfbe16063c9d633a79810944ac7eba (diff)
parentae7a01e137f14055f9472408d0cf3ebf9893afba (diff)
downloadrsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.gz
rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.tar.xz
rsyslog-4df8bb4e6b6c8183c504fdb31d667717bf7584e5.zip
Merge branch 'beta'
Conflicts: doc/omrelp.html
Diffstat (limited to 'doc/rsyslog_stunnel.html')
-rw-r--r--doc/rsyslog_stunnel.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/rsyslog_stunnel.html b/doc/rsyslog_stunnel.html
index f4f82cd0..f0c0b3af 100644
--- a/doc/rsyslog_stunnel.html
+++ b/doc/rsyslog_stunnel.html
@@ -23,7 +23,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,