diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 12:13:26 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-24 12:13:26 +0200 |
| commit | 2716bc9ffc0b667ce63ea7407b6ca7742bf168ec (patch) | |
| tree | 00d4724a4b684b682beaf429a280613e5a0a5cd2 /tools | |
| parent | 63daa0385cfe4c2999a32c62ff90e9b6e3c1f44e (diff) | |
| parent | 539f33c6a064b8c28cbb318e856dc50c213fd844 (diff) | |
Merge branch 'master' into v5-devel
IMPORTANT: this merge did NOT include the (important) changes
to action.c . Consolidating them was too hard (aka "error-prone")
because of the large differences in the code base. The fixes will
be redone with a later commit.
Conflicts:
action.c
configure.ac
doc/manual.html
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/rsyslogd.8 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 7abcf97a..7d4b5e03 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -234,14 +234,14 @@ reacts to a set of signals. You may easily send a signal to using the following: .IP .nf -kill -SIGNAL $(cat /var/run/syslogd.pid) +kill -SIGNAL $(cat /var/run/rsyslogd.pid) .fi .PP Note that -SIGNAL must be replaced with the actual signal you are trying to send, e.g. with HUP. So it then becomes: .IP .nf -kill -HUP $(cat /var/run/syslogd.pid) +kill -HUP $(cat /var/run/rsyslogd.pid) .fi .PP .TP |