summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-07-11 15:53:39 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-07-11 15:53:39 +0200
commitf4102989426e2c1b127f28c7d5a45d2dd4ea70f8 (patch)
treea17b30bc936fad14bc437d2db943b5efd045dc43 /doc/manual.html
parent3a8a1e1fac090097853462ac2016bb1442fa8734 (diff)
parent0b7eaa413a58aa3d92e9c4f384029c9393e00250 (diff)
downloadrsyslog-f4102989426e2c1b127f28c7d5a45d2dd4ea70f8.tar.gz
rsyslog-f4102989426e2c1b127f28c7d5a45d2dd4ea70f8.tar.xz
rsyslog-f4102989426e2c1b127f28c7d5a45d2dd4ea70f8.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac rsyslog.conf runtime/queue.c
Diffstat (limited to 'doc/manual.html')
-rw-r--r--doc/manual.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/manual.html b/doc/manual.html
index 644ac77c..c15eead5 100644
--- a/doc/manual.html
+++ b/doc/manual.html
@@ -31,8 +31,8 @@ if you do not read the doc, but doing so will definitely improve your experience
<p><span style="font-weight: bold;"></span><b>Follow
the links below for the</b><br></p><ul>
-<li><a href="rsyslog_conf.html">configuration file
-syntax (rsyslog.conf)</a></li>
+<li><a href="troubleshoot.html">troubleshooting rsyslog problems</a></li>
+<li><a href="rsyslog_conf.html">configuration file syntax (rsyslog.conf)</a></li>
<li> <a href="property_replacer.html">property
replacer, an important core component</a></li>
<li>a commented <a href="sample.conf.html">sample