summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/rsconf1_actionexeconlywhenpreviousissuspended.html (renamed from doc/rsconf1_actionexeconlyifpreviousissuspended.html)2
-rw-r--r--doc/rsyslog_conf.html2
-rw-r--r--rsyslogd.87
3 files changed, 3 insertions, 8 deletions
diff --git a/doc/rsconf1_actionexeconlyifpreviousissuspended.html b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
index 2568ccfb..3f18e243 100644
--- a/doc/rsconf1_actionexeconlyifpreviousissuspended.html
+++ b/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
@@ -3,7 +3,7 @@
<title>rsyslog.conf file</title>
</head>
<body>
-<h2>$ActionExecOnlyIfPreviousIsSuspended</h2>
+<h2>$ActionExecOnlyWhenPreviousIsSuspended</h2>
<p><b>Type:</b> global configuration directive</p>
<p><b>Default:</b> off</p>
<p><b>Description:</b></p>
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index f2b2f6ba..63f92d6e 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -33,7 +33,7 @@ development and quite unstable...). So you have been warned ;)</p>
- many parameter settings modify queue parameters. If in doubt, use the default,
it is usually well-chosen and applicable in most cases.</p>
<ul>
- <li><a href="rsconf1_actionexeconlyifpreviousissuspended.html">$ActionExecOnlyIfPreviousIsSuspended</a></li>
+ <li><a href="rsconf1_actionexeconlywhenpreviousissuspended.html">$ActionExecOnlyWhenPreviousIsSuspended</a></li>
<li>$ActionQueueCheckpointInterval &lt;number&gt;</li>
<li>$ActionQueueDequeueSlowdown &lt;number&gt; [number is timeout in <i>
micro</i>seconds (1000000us is 1sec!), default 0 (no delay). Simple
diff --git a/rsyslogd.8 b/rsyslogd.8
index b97f67bb..031c5edd 100644
--- a/rsyslogd.8
+++ b/rsyslogd.8
@@ -250,15 +250,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