Blob Blame History Raw
diff -up rsyslog-7.2.2/tools/rsyslogd.8.orig rsyslog-7.2.2/tools/rsyslogd.8
--- rsyslog-7.2.2/tools/rsyslogd.8.orig	2012-11-20 16:31:26.530284950 +0100
+++ rsyslog-7.2.2/tools/rsyslogd.8	2012-11-20 16:31:34.172188889 +0100
@@ -131,11 +131,7 @@ syntax errors are reported. Please note 
 technical and orignally targeted towards developers.
 .TP
 .B "\-d"
-Turns on debug mode.  Using this the daemon will not proceed a 
-.BR fork (2)
-to set itself in the background, but opposite to that stay in the
-foreground and write much debug information on the current tty.  See the
-DEBUGGING section for more information.
+Turns on debug mode. See the DEBUGGING section for more information.
 .TP
 .BI "\-f " "config file"
 Specify an alternative configuration file instead of
@@ -294,11 +290,17 @@ be prevented by using GSS-API authentica
 to think about syslog network security before enabling it.
 .LP
 .SH DEBUGGING
-When debugging is turned on using
+When debugging is turned on using the
 .B "\-d"
-option then
+option,
 .B rsyslogd
-will be very verbose by writing much of what it does on stdout.
+produces debugging information according to the
+.B RSYSLOG_DEBUG
+environment variable and the signals received. When run in foreground,
+the information is written to stdout. An additional output file can be
+specified using the
+.B RSYSLOG_DEBUGLOG
+environment variable.
 .SH FILES
 .PD 0
 .TP
@@ -325,10 +327,17 @@ is specified during compilation (e.g. /u
 .SH ENVIRONMENT
 .TP
 .B RSYSLOG_DEBUG
-Controls runtime debug support.It contains an option string with the
+Controls runtime debug support. It contains an option string with the
 following options possible (all are case insensitive):
 
 .RS
+.IP Debug
+Turns on debugging and prevents forking. This is processed earlier
+in the startup than command line options (i.e. -d) and as such
+enables earlier debugging output. Mutually exclusive with DebugOnDemand.
+.IP DebugOnDemand
+Enables debugging but turns off debug output. The output can be toggled
+by sending SIGUSR1. Mutually exclusive with Debug.
 .IP LogFuncFlow
 Print out the logical flow of functions (entering and exiting them)
 .IP FileTrace