Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/doc/man_pages/diagnostic-options.adoc b/doc/man_pages/diagnostic-options.adoc
new file mode 100644
index 00000000..1500168f
--- /dev/null
+++ b/doc/man_pages/diagnostic-options.adoc
@@ -0,0 +1,24 @@
+== DIAGNOSTIC OPTIONS
+
+--log-level <level>:: Set the active log level.
+Supported levels in lowest to highest order are "noisy", "debug", "info", "message", "warning", "critical", and "error".
+Messages at each level and higher will be printed, for example "warning" prints "warning", "critical", and "error" messages and "noisy" prints all messages.
+Levels are case insensitive.
+
+--log-fatal <level>:: Abort the program if any messages are logged at the specified level or higher.
+For example, "warning" aborts on any "warning", "critical", or "error" messages.
+
+// XXX List available domains if no list is provided?
+--log-domains <list>:: Only print messages for the specified log domains, e.g. "GUI,Epan,sshdump".
+List of domains must be comma-separated. Can be negated with "!" as the first character (inverts the match).
+
+--log-debug <list>:: Force the specified domains to log at the "debug" level.
+List of domains must be comma-separated. Can be negated with "!" as the first character (inverts the match).
+
+--log-noisy <list>:: Force the specified domains to log at the "noisy" level.
+List of domains must be comma-separated. Can be negated with "!" as the first character (inverts the match).
+
+--log-fatal-domains <list>:: Abort the program if any messages are logged for the specified log domains.
+List of domains must be comma-separated.
+
+--log-file <path>:: Write log messages and stderr output to the specified file.