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/index.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/index.html')
-rw-r--r-- | doc/index.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/index.html b/doc/index.html index 349c8e57..b3b336a7 100644 --- a/doc/index.html +++ b/doc/index.html @@ -25,8 +25,7 @@ To do the really cool things, though, you need to learn a bit about its new features. The man pages offer a bare minimum of information (and are still quite long). Read the <a href="manual.html">html documentation</a> instead. -When you change the configuration, -remember to restart (or HUP) rsyslogd, because otherwise it won't use your -new settings (and you'll end up totally puzzled why this great config of yours -does not even work a bit...;)) +When you change the configuration, remember to restart rsyslogd, because otherwise +it will not use your new settings (and you'll end up totally puzzled why this great +config of yours does not even work a bit...;)) </body></html> |