summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_tls.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-07-15 11:47:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-07-15 11:47:58 +0200
commit9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8 (patch)
tree10cf3b035fbd24ab2504b4cc7c1118878923e8b7 /doc/rsyslog_tls.html
parent5416a94bbe9a24ad9236755a9e21944685fc231b (diff)
parentf7894c401fdb8a2ad7bb3a1d87a74d438cc366c3 (diff)
downloadrsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.gz
rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.tar.xz
rsyslog-9db3e14e45f66356d1e6f5e2337b4ef3a45a6ce8.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'doc/rsyslog_tls.html')
-rw-r--r--doc/rsyslog_tls.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/rsyslog_tls.html b/doc/rsyslog_tls.html
index e37d26a7..bb312c77 100644
--- a/doc/rsyslog_tls.html
+++ b/doc/rsyslog_tls.html
@@ -128,7 +128,7 @@ This is all you need to do. You can use the rest of your rsyslog.conf
together with this configuration. The way messages are received does
not interfer with any other option, so you are able to do anything else
you like without any restrictions.
-<p>Restart (or HUP) rsyslogd. The server should now be fully
+<p>Restart rsyslogd. The server should now be fully
operational.</p>
<h3>Client Setup</h3>
<p>The client setup is equally&nbsp;simple. You need less