diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 17:28:29 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-16 17:28:29 +0200 |
commit | 4beff8dab6ff3d0cb2e386ca6c4b468371bef05a (patch) | |
tree | a2179a9847a555d05d31e3614377e9f5b6ca1857 /doc/rsyslog_conf.html | |
parent | 2d5e8ba7cd05a95f897506e51dcc5adb06dbcaa8 (diff) | |
parent | f07d74a87f91b6fe2f5091ec2547b7886ab3a23e (diff) | |
download | rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.gz rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.tar.xz rsyslog-4beff8dab6ff3d0cb2e386ca6c4b468371bef05a.zip |
Merge branch 'nextmaster' into oracle
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'doc/rsyslog_conf.html')
-rw-r--r-- | doc/rsyslog_conf.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html index 852d95b5..6990c6bd 100644 --- a/doc/rsyslog_conf.html +++ b/doc/rsyslog_conf.html @@ -26,7 +26,7 @@ Lines can be continued by specifying a backslash ("\") as the last character of the line. There is a hard-coded maximum line length of 4K. If you need lines larger than that, you need to change compile-time settings inside rsyslog and recompile. -<h2><a href="rsyslog_conf_global.html">Global Directives</a></h2> +<h2><a href="rsyslog_conf_global.html">Configuration Directives</a></h2> <h2>Basic Structure</h2> <p>Rsyslog supports standard sysklogd's configuration file format and extends it. So in general, you can take a "normal" syslog.conf and @@ -74,9 +74,9 @@ such features is available in rsyslogd, only.</p> [<a href="http://www.rsyslog.com/">rsyslog site</a>]</p> <p><font size="2">This documentation is part of the <a href="http://www.rsyslog.com/">rsyslog</a> project.<br> -Copyright © 2008 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and +Copyright © 2008,2009 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and <a href="http://www.adiscon.com/">Adiscon</a>. Released under the GNU GPL -version 2 or higher.</font></p> +version 3 or higher.</font></p> </body> </html> > |