diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-20 16:03:51 +0200 |
| commit | 534e07d738fc5c7f5464ab94a010cc7113dfad2c (patch) | |
| tree | 389432aabff3f72aee014452f7b449f41e829315 /doc/rsyslog_conf_modules.html | |
| parent | 527edddb4646c24fa9a587601cd90d7a57a1fcf0 (diff) | |
| parent | 74000ea71eb47c19653e0cd7bbffb83d913c3923 (diff) | |
| download | rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.gz rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.tar.bz2 rsyslog-534e07d738fc5c7f5464ab94a010cc7113dfad2c.zip | |
Merge branch 'v4-devel' into master
Conflicts:
plugins/imsolaris/imsolaris.c
tests/Makefile.am
Diffstat (limited to 'doc/rsyslog_conf_modules.html')
| -rw-r--r-- | doc/rsyslog_conf_modules.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html index a246d0ca..b721c935 100644 --- a/doc/rsyslog_conf_modules.html +++ b/doc/rsyslog_conf_modules.html @@ -40,6 +40,7 @@ to message generators. <li>immark - support for mark messages</li> <li><a href="imklog.html">imklog</a> - kernel logging</li> <li><a href="imuxsock.html">imuxsock</a> - unix sockets, including the system log socket</li> +<li><a href="imsolaris.html">imsolaris</a> - input for the Sun Solaris system log source</li> <li><a href="im3195.html">im3195</a> - accepts syslog messages via RFC 3195</li> </ul> |