diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 12:49:16 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 12:49:16 +0200 |
commit | a77a99bfbf8505d05b08a981ab25d599af864ce5 (patch) | |
tree | 2445512303106459f455d359114c71c46ef87353 /doc/rsyslog_conf_modules.html | |
parent | d3fe3b28aca6ffd616f55929af9f459585739a06 (diff) | |
parent | 32e715929f5d946d7244db3bc0595842dd293dd9 (diff) | |
download | rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.gz rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.tar.xz rsyslog-a77a99bfbf8505d05b08a981ab25d599af864ce5.zip |
Merge branch 'v4-devel' into master
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> |