diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:06:40 -0700 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 08:06:40 -0700 |
| commit | 5d8b1846ec376f590b390aef22566b6f87a8c188 (patch) | |
| tree | caac7e1cc47713f6a30b3a8c631fca981080c8f7 /doc/rsyslog_conf_modules.html | |
| parent | 6714bb931bcbe8d1a4ca60f503598f57e6ebe3b9 (diff) | |
| parent | 3700a64d973f55e1cc8bd478e203f00d529ce27b (diff) | |
| download | rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.tar.gz rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.tar.xz rsyslog-5d8b1846ec376f590b390aef22566b6f87a8c188.zip | |
Merge branch 'v4-devel' into v5-beta
Conflicts:
Makefile.am
tests/tcpflood.c
Diffstat (limited to 'doc/rsyslog_conf_modules.html')
| -rw-r--r-- | doc/rsyslog_conf_modules.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html index 213769d2..2a64461d 100644 --- a/doc/rsyslog_conf_modules.html +++ b/doc/rsyslog_conf_modules.html @@ -36,7 +36,8 @@ to message generators. <li><a href="imfile.html">imfile</a> - input module for text files</li> <li><a href="imrelp.html">imrelp</a> - RELP input module</li> <li>imudp - udp syslog message input</li> -<li><a href="imtcp.html">imtcp</a> - input plugin for plain tcp syslog</li> +<li><a href="imtcp.html">imtcp</a> - input plugin for tcp syslog</li> +<li><a href="imptcp.html">imptcp</a> - input plugin for plain tcp syslog (no TLS but faster)</li> <li><a href="imgssapi.html">imgssapi</a> - input plugin for plain tcp and GSS-enabled syslog</li> <li>immark - support for mark messages</li> <li><a href="imklog.html">imklog</a> - kernel logging</li> |