diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-02 10:55:31 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-02 10:55:31 +0200 |
| commit | 9812a2af8c308c1b29bc0b5604593595a66dd25d (patch) | |
| tree | 2b556403f1a495f695fa125d34c2c5819e13f2b6 /doc/rsyslog_conf.html | |
| parent | 75d8becf10cf83c984590ce9ba666d86b382e7e6 (diff) | |
| parent | 223c1e48610c27270fdb8532f5e4a920eb9874f3 (diff) | |
| download | rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.gz rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.tar.xz rsyslog-9812a2af8c308c1b29bc0b5604593595a66dd25d.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
runtime/net.c
Diffstat (limited to 'doc/rsyslog_conf.html')
| -rw-r--r-- | doc/rsyslog_conf.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index 8f258a8b..a74f2d44 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> - @@ -1209,6 +1209,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> - </p> +such features is available in rsyslogd, only.</p> </body></html> |