summaryrefslogtreecommitdiffstats
path: root/doc/rsyslog_conf.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-10-02 10:56:57 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-10-02 10:56:57 +0200
commit0191f6b8a8c629f9d84efdb607b6971dc8323707 (patch)
tree3fee9ff12a2e9761f4c198bb21e48d940585fbae /doc/rsyslog_conf.html
parent86f76c1299b7827549a0cd754960347af627e18d (diff)
parent09d2e1c707d6cdb6841559e69591c57536b998b7 (diff)
downloadrsyslog-0191f6b8a8c629f9d84efdb607b6971dc8323707.tar.gz
rsyslog-0191f6b8a8c629f9d84efdb607b6971dc8323707.tar.xz
rsyslog-0191f6b8a8c629f9d84efdb607b6971dc8323707.zip
Merge branch 'master' into helgrind
Diffstat (limited to 'doc/rsyslog_conf.html')
-rw-r--r--doc/rsyslog_conf.html7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 0db69451..7cd40cb7 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -29,7 +29,7 @@ what they do (list is currently not complete)</p>
trap output module</li>
<li><a href="omrelp.html">omrelp</a> - RELP
output module</li>
-<li>omgss - output module for GSS-enabled syslog</li>
+<li>omgssapi - output module for GSS-enabled syslog</li>
<li><a href="ommysql.html">ommysql</a> - output module for MySQL</li>
<li>ompgsql - output module for PostgreSQL</li>
<li><a href="omlibdbi.html">omlibdbi</a> -
@@ -45,7 +45,7 @@ input module</li>
<li><a href="imtcp.html">imtcp</a> - input
plugin for plain tcp syslog</li>
<li><a href="imgssapi.html">imgssapi</a> -
-input plugin for plain tcp and GSS-enable syslog</li>
+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> -
@@ -1255,6 +1255,5 @@ When compared to syslogd from sysklogd package, rsyslogd offers
additional
<a href="features.html">features</a> (like template
and database support). For obvious reasons, the syntax for defining
-such features is available in rsyslogd, only.<br>
-&nbsp;</p>
+such features is available in rsyslogd, only.</p>
</body></html>