diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:17:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:17:23 +0200 |
| commit | 6d8df125979065640598bc9126258dc8645f748d (patch) | |
| tree | c625b87b1ad7586222e99410d784703aad7b8c95 /doc/rsyslog_tls.html | |
| parent | 1e9febaf28ffa1a6107cd0f5f2c0ac0ab2b16830 (diff) | |
| parent | d7cfdcf28c1239908619aadac6ef4fa43f1b93fd (diff) | |
| download | rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.gz rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.xz rsyslog-6d8df125979065640598bc9126258dc8645f748d.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
doc/rsyslog_conf.html
Diffstat (limited to 'doc/rsyslog_tls.html')
| -rw-r--r-- | doc/rsyslog_tls.html | 2 |
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 simple. You need less |