summaryrefslogtreecommitdiffstats
path: root/rsyslog.conf
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 /rsyslog.conf
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 'rsyslog.conf')
-rw-r--r--rsyslog.conf6
1 files changed, 2 insertions, 4 deletions
diff --git a/rsyslog.conf b/rsyslog.conf
index 331a202b..ce7d131a 100644
--- a/rsyslog.conf
+++ b/rsyslog.conf
@@ -1,6 +1,5 @@
-# for help with rsyslog configuration, visit
-# http://www.rsyslog.com or the wiki at
-# http://wiki.rsyslog.com
+# if you experience problems, check
+# http://www.rsyslog.com/troubleshoot for assistance
# rsyslog v3: load input modules
# If you do not load inputs, nothing happens!
@@ -59,4 +58,3 @@ local7.* /var/log/boot.log
# UDP Syslog Server:
#$ModLoad imudp.so # provides UDP syslog reception
#$UDPServerRun 514 # start a UDP syslog server at standard port 514
-