summaryrefslogtreecommitdiff
path: root/doc/rsyslog_conf.html
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-03-05 17:35:26 +0100
committerMichael Biebl <biebl@debian.org>2013-03-05 17:35:26 +0100
commitac1a840d0afd724fa614eed5d64112a9ecf097f8 (patch)
tree29fc7cd1a00820ae3bda8e5b08e32da89c055e60 /doc/rsyslog_conf.html
parent3793efd744861415cbb0e10df6ac9eab7b21e78e (diff)
downloadrsyslog-ac1a840d0afd724fa614eed5d64112a9ecf097f8.tar.gz
Imported Upstream version 7.2.6upstream/7.2.6
Diffstat (limited to 'doc/rsyslog_conf.html')
-rw-r--r--doc/rsyslog_conf.html15
1 files changed, 7 insertions, 8 deletions
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 6aa2e46..c5f4d2e 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -21,16 +21,15 @@ especially useful while you are migrating from syslogd to rsyslogd.</p>
<p><b>Follow the links below to learn more about specific topics:</b></p>
<ul>
-<li><a href="rsyslog_conf_modules.html">Modules</a></li>
-<li><a href="rsyslog_conf_lines.html">Lines</a></li>
-<li><a href="rsyslog_conf_global.html">Configuration Directives</a></li>
<li><a href="rsyslog_conf_basic_structure.html">Basic Structure</a></li>
+<li><a href="rsyslog_conf_modules.html">Modules</a></li>
<li><a href="rsyslog_conf_templates.html">Templates</a></li>
-<li><a href="rsyslog_conf_output.html">Output Channels</a></li>
<li><a href="rsyslog_conf_filter.html">Filter Conditions</a></li>
-<li><a href="rsyslog_conf_actions.html">Actions</a></li>
-<li><a href="rsyslog_conf_file_syntax_differences.html">Configuration File Syntax Differences</a></li>
-<li><a href="rsyslog_conf_examples.html">Examples</a></li>
+<li><a href="rsyslog_conf_actions.html">Actions (legacy format)</a></li>
+<li><a href="rsyslog_conf_output.html">Output Channels</a></li>
+<!--<li><a href="rsyslog_conf_examples.html">Examples</a></li>-->
+<li><a href="rsyslog_conf_global.html">Legacy Configuration Directives</a></li>
+<li><a href="rsyslog_conf_sysklogd_compatibility.html">sysklogd compatibility</a></li>
</ul>
<p>[<a href="rsyslog_conf.html">back to top</a>]
@@ -38,7 +37,7 @@ especially useful while you are migrating from syslogd to rsyslogd.</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 &copy; 2008-2011 by <a href="http://www.gerhards.net/rainer">Rainer Gerhards</a> and
+Copyright &copy; 2008-2013 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 3 or higher.</font></p>
</body>