diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 11:49:32 +0200 |
| commit | 32e715929f5d946d7244db3bc0595842dd293dd9 (patch) | |
| tree | 2a154cd6984690e91569feebcd6924efa0eb91b7 /doc/rsyslog_conf_modules.html | |
| parent | 89f7dddf36d57c9261464560e3b2c0fb8ea88fd2 (diff) | |
| parent | c664adfa1683763ae503f2da9e8d4d528d6634d1 (diff) | |
| download | rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.gz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.tar.xz rsyslog-32e715929f5d946d7244db3bc0595842dd293dd9.zip | |
Merge branch 'v4-stable-imptcp' into tmp
Conflicts:
Makefile.am
configure.ac
runtime/rsyslog.h
tests/Makefile.am
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 a6555c1a..b2830535 100644 --- a/doc/rsyslog_conf_modules.html +++ b/doc/rsyslog_conf_modules.html @@ -27,7 +27,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> |