summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_conf_modules.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-09-07 15:38:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-09-07 15:38:57 +0200
commit11ee5cbdfb08ba3e42a853c08144fa24cd55d6da (patch)
treeeb981082bfe83c80b74149a1927ff0470b70db62 /doc/rsyslog_conf_modules.html
parent76c9616612a23796349a42d9b236a1cb0b836133 (diff)
parent156d3f64e7ce50a570c1f8f95f51406c4853aad8 (diff)
downloadrsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.tar.gz
rsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.tar.xz
rsyslog-11ee5cbdfb08ba3e42a853c08144fa24cd55d6da.zip
Merge branch 'v4-beta' into v4-stable, prep for 4.8.0v4.8.0
There are no changes compared to 4.7.5, just a re-release with the new version number as new v4-stable. The most important new feature is Solaris support. Conflicts: configure.ac doc/manual.html
Diffstat (limited to 'doc/rsyslog_conf_modules.html')
-rw-r--r--doc/rsyslog_conf_modules.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/rsyslog_conf_modules.html b/doc/rsyslog_conf_modules.html
index 675b8bb3..b2830535 100644
--- a/doc/rsyslog_conf_modules.html
+++ b/doc/rsyslog_conf_modules.html
@@ -27,11 +27,13 @@ to message generators.
<li><a href="imfile.html">imfile</a> -&nbsp; 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>
<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>
@@ -51,6 +53,7 @@ SQLLite, Ingres, Oracle, mSQL)</li>
<li><a href="ommail.html">ommail</a> -
permits rsyslog to alert folks by mail if something important happens</li>
<li><a href="omoracle.html">omoracle</a> - output module for Oracle (native OCI interface)</li>
+<li><a href="omuxsock.html">omuxsock</a> - output module Unix domain sockets</li>
</ul>
<h2>Library Modules</h2>