diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 17:04:10 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 17:04:10 +0100 |
| commit | abb381b8a5861be1d065afea85f355f478d87e5d (patch) | |
| tree | e6a68876e67f9c3a3ec0f87194a9bafccf08210b /tools/rsyslog.conf.5 | |
| parent | d5a18a93ae585c25d67ec200b308f08c6bd6d5b2 (diff) | |
| parent | de52870bb16c9ad6acba92c40af86f2c70069c97 (diff) | |
| download | rsyslog-abb381b8a5861be1d065afea85f355f478d87e5d.tar.gz rsyslog-abb381b8a5861be1d065afea85f355f478d87e5d.tar.xz rsyslog-abb381b8a5861be1d065afea85f355f478d87e5d.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
plugins/imtcp/imtcp.c
Diffstat (limited to 'tools/rsyslog.conf.5')
| -rw-r--r-- | tools/rsyslog.conf.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/rsyslog.conf.5 b/tools/rsyslog.conf.5 index 6ce3c0e0..dcc9b7c7 100644 --- a/tools/rsyslog.conf.5 +++ b/tools/rsyslog.conf.5 @@ -121,7 +121,7 @@ no longer provided by the rsyslog package. .I imuxsock Unix sockets, including the system log socket. You need to specify .IP -$ModLoad imudp +$ModLoad imuxsock in order to receive log messages from local system processes. This config directive should only left out if you know exactly what you |