summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-02-11 12:51:53 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2008-02-11 12:51:53 +0000
commit14a7c82fadd27446af318c61cb46992802a3aa3c (patch)
treeccd6432bdc5de379fef4bc14b8a84b4cb254fb29
parent91b54ed246977cb961977ca400c19b6d5b107583 (diff)
downloadrsyslog-14a7c82fadd27446af318c61cb46992802a3aa3c.tar.gz
rsyslog-14a7c82fadd27446af318c61cb46992802a3aa3c.tar.xz
rsyslog-14a7c82fadd27446af318c61cb46992802a3aa3c.zip
bugfix (doc): misspelled config directive, invalid signal info - thanks to
Peter Vrabec for pointing this out
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac2
-rw-r--r--doc/rsconf1_actionexeconlywhenpreviousissuspended.html (renamed from doc/rsconf1_actionexeconlyifpreviousissuspended.html)0
-rw-r--r--doc/rsyslog_conf.html2
-rw-r--r--rsyslogd.87
5 files changed, 4 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f2f70a4..a1bba738 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ Version 2.0.2 STABLE (rgerhards), 2008-02-??
pointing out this problem.
- bugfix: trailing ":" of tag was lost while parsing legacy syslog messages
without timestamp - thanks to Anders Blomdell for providing a patch!
+- bugfix (doc): misspelled config directive, invalid signal info
---------------------------------------------------------------------------
Version 2.0.1 STABLE (rgerhards), 2008-01-24
- fixed a bug in integer conversion - but this function was never called,
diff --git a/configure.ac b/configure.ac
index 6ca8bb41..bb66bfd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([rsyslog],[2.0.1],[rsyslog@lists.adiscon.com.])
+AC_INIT([rsyslog],[2.0.2],[rsyslog@lists.adiscon.com.])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([syslogd.c])
AC_CONFIG_HEADERS([config.h])
diff --git a/doc/rsconf1_actionexeconlyifpreviousissuspended.html b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
index 2568ccfb..2568ccfb 100644
--- a/doc/rsconf1_actionexeconlyifpreviousissuspended.html
+++ b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 3ee2ae60..bf878e82 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -25,7 +25,7 @@ to rsyslogd.</p>
start with a dollar-sign. Here is a list in alphabetical order. Follow links for
a description.</p>
<ul>
- <li><a href="rsconf1_actionexeconlyifpreviousissuspended.html">$ActionExecOnlyIfPreviousIsSuspended</a></li>
+ <li><a href="rsconf1_actionexeconlywhenpreviousissuspended.html">$ActionExecOnlyWhenPreviousIsSuspended</a></li>
<li><a href="rsconf1_actionresumeinterval.html">$ActionResumeInterval</a></li>
<li><a href="rsconf1_allowedsender.html">$AllowedSender</a></li>
<li><a href="rsconf1_controlcharacterescapeprefix.html">$ControlCharacterEscapePrefix</a></li>
diff --git a/rsyslogd.8 b/rsyslogd.8
index 58aec529..1d44b8d8 100644
--- a/rsyslogd.8
+++ b/rsyslogd.8
@@ -276,15 +276,10 @@ will be reread and the
.BR rsyslog (3)
facility is started again.
.TP
-.B SIGTERM
+.B SIGTERM "," SIGINT "," SIGQUIT
.B Rsyslogd
will die.
.TP
-.BR SIGINT ", " SIGQUIT
-If debugging is enabled these are ignored, otherwise
-.B rsyslogd
-will die.
-.TP
.B SIGUSR1
Switch debugging on/off. This option can only be used if
.B rsyslogd