Simone Caronni af933f
commit c2fb0f13bbc8c6a71026ff7b491ac58fd0d8d240
Simone Caronni af933f
Author: Simone Caronni <negativo17@gmail.com>
Simone Caronni af933f
Date:   Sun Mar 30 16:07:16 2014 +0200
Simone Caronni af933f
Simone Caronni af933f
    Align command line switches in manpages.
Simone Caronni af933f
Simone Caronni af933f
diff --git a/bacula/manpages/bacula-dir.8 b/bacula/manpages/bacula-dir.8
Simone Caronni af933f
index c5cd965..e3664b6 100644
Simone Caronni af933f
--- a/bacula/manpages/bacula-dir.8
Simone Caronni af933f
+++ b/bacula/manpages/bacula-dir.8
Petr Hracek 8bcad0
@@ -37,6 +37,9 @@ Run in foreground (for debugging).
Petr Hracek 8bcad0
 .BI \-g\  group
Petr Hracek 8bcad0
 Set the group/gid to run as.
Petr Hracek 8bcad0
 .TP
Simone Caronni af933f
+.BI \-m
Simone Caronni af933f
+Print kaboom output (for debugging).
Petr Hracek 8bcad0
+.TP
Petr Hracek 8bcad0
 .BI \-r\  job
Petr Hracek 8bcad0
 Run <job>.
Petr Hracek 8bcad0
 .TP
Simone Caronni af933f
diff --git a/bacula/manpages/bacula-fd.8 b/bacula/manpages/bacula-fd.8
Simone Caronni af933f
index 9e9fca0..6a4d7fb 100644
Simone Caronni af933f
--- a/bacula/manpages/bacula-fd.8
Simone Caronni af933f
+++ b/bacula/manpages/bacula-fd.8
Petr Hracek 8bcad0
@@ -39,12 +39,12 @@ Run in foreground (for debugging).
Petr Hracek 8bcad0
 .BI \-g\  group
Petr Hracek 8bcad0
 Set the group/gid to run as.
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
-.BI \-p
Petr Hracek 8bcad0
-Proceed inspite of I/O errors
Petr Hracek 8bcad0
-.TP
Petr Hracek 8bcad0
 .BI \-k
Petr Hracek 8bcad0
 Keep readall permission when dropping privileges.
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
+.BI \-m
Simone Caronni af933f
+Print kaboom output (for debugging).
Petr Hracek 8bcad0
+.TP
Petr Hracek 8bcad0
 .BI \-s
Petr Hracek 8bcad0
 No signals (for debugging).
Petr Hracek 8bcad0
 .TP
Simone Caronni af933f
diff --git a/bacula/manpages/bacula-sd.8 b/bacula/manpages/bacula-sd.8
Petr Hracek 8bcad0
index 6dd36dc..aed27a3 100644
Simone Caronni af933f
--- a/bacula/manpages/bacula-sd.8
Simone Caronni af933f
+++ b/bacula/manpages/bacula-sd.8
Petr Hracek 8bcad0
@@ -40,6 +40,9 @@ Set the group/gid to run as.
Petr Hracek 8bcad0
 .BI \-p
Petr Hracek 8bcad0
 Proceed in spite of I/O errors
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
+.BI \-m
Petr Hracek 8bcad0
+Print kaboom output (for debugging)
Petr Hracek 8bcad0
+.TP
Petr Hracek 8bcad0
 .BI \-s
Petr Hracek 8bcad0
 No signals (for debugging).
Petr Hracek 8bcad0
 .TP
Simone Caronni af933f
diff --git a/bacula/manpages/bacula-tray-monitor.1 b/bacula/manpages/bacula-tray-monitor.1
Simone Caronni af933f
index 811a4e4..39a2869 100644
Simone Caronni af933f
--- a/bacula/manpages/bacula-tray-monitor.1
Simone Caronni af933f
+++ b/bacula/manpages/bacula-tray-monitor.1
Simone Caronni af933f
@@ -25,6 +25,9 @@ Specify configuration file.
Simone Caronni af933f
 .B \-d <nn>
Simone Caronni af933f
 Set debug level to \fInn\fP.
Simone Caronni af933f
 .TP
Simone Caronni af933f
+.B \-dt
Simone Caronni af933f
+Print timestamp in debug output.
Simone Caronni af933f
+.TP
Simone Caronni af933f
 .B \-t
Simone Caronni af933f
 Test config mode: read configuration and exit.
Simone Caronni af933f
 .TP
Simone Caronni af933f
@@ -32,7 +35,6 @@ Test config mode: read configuration and exit.
Simone Caronni af933f
 Show version and usage of program.
Simone Caronni af933f
 .SH SEE ALSO
Simone Caronni af933f
 .BR bacula-dir (8),
Simone Caronni af933f
-.BR bacula-wxconsole (1)
Simone Caronni af933f
 .BR bls (1),
Simone Caronni af933f
 .BR bextract (1).
Simone Caronni af933f
 .br
Simone Caronni af933f
diff --git a/bacula/manpages/bconsole.8 b/bacula/manpages/bconsole.8
Simone Caronni af933f
index 13d892c..b536783 100644
Simone Caronni af933f
--- a/bacula/manpages/bconsole.8
Simone Caronni af933f
+++ b/bacula/manpages/bconsole.8
Petr Hracek 8bcad0
@@ -18,6 +18,12 @@ command.
Petr Hracek 8bcad0
 .PP
Petr Hracek 8bcad0
 .SH OPTIONS
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
+.BI \-D\  dir
Petr Hracek 8bcad0
+Select a Director.
Petr Hracek 8bcad0
+.TP
Petr Hracek 8bcad0
+.BI \-l
Petr Hracek 8bcad0
+List defined Directors.
Petr Hracek 8bcad0
+.TP
Petr Hracek 8bcad0
 .BI \-c\  config
Petr Hracek 8bcad0
 Specify configuration file.
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
@@ -33,6 +39,9 @@ No conio (for scripting).
Petr Hracek 8bcad0
 .B \-s
Petr Hracek 8bcad0
 No signals (for debugging).
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
+.b \-u\  nn
Simone Caronni af933f
+Set command execution timeout to \fInn\fP seconds.
Petr Hracek 8bcad0
+.TP
Petr Hracek 8bcad0
 .B \-t
Petr Hracek 8bcad0
 Test the configuration file and report errors.
Petr Hracek 8bcad0
 .TP
Simone Caronni af933f
diff --git a/bacula/manpages/btape.8 b/bacula/manpages/btape.8
Simone Caronni af933f
index e19a36f..2188ce2 100644
Simone Caronni af933f
--- a/bacula/manpages/btape.8
Simone Caronni af933f
+++ b/bacula/manpages/btape.8
Petr Hracek 8bcad0
@@ -38,9 +38,6 @@ Set debug level to \fInn\fP.
Petr Hracek 8bcad0
 .BI \-p
Petr Hracek 8bcad0
 Proceed inspite of I/O errors.
Petr Hracek 8bcad0
 .TP
Petr Hracek 8bcad0
-.B \-t
Petr Hracek 8bcad0
-Open the default tape device.
Petr Hracek 8bcad0
-.TP
Petr Hracek 8bcad0
 .B \-s
Petr Hracek 8bcad0
 No signals (for debugging).
Petr Hracek 8bcad0
 .TP
Simone Caronni af933f
diff --git a/bacula/src/console/console.c b/bacula/src/console/console.c
Simone Caronni af933f
index 80176a7..b1f1476 100644
Simone Caronni af933f
--- a/bacula/src/console/console.c
Simone Caronni af933f
+++ b/bacula/src/console/console.c
Simone Caronni af933f
@@ -1011,7 +1011,7 @@ int main(int argc, char *argv[])
Petr Hracek 8bcad0
    working_directory = "/tmp";
Petr Hracek 8bcad0
    args = get_pool_memory(PM_FNAME);
Petr Hracek 8bcad0
 
Petr Hracek 8bcad0
-   while ((ch = getopt(argc, argv, "D:lbc:d:nstu:?")) != -1) {
Petr Hracek 8bcad0
+   while ((ch = getopt(argc, argv, "D:lc:d:nstu:?")) != -1) {
Petr Hracek 8bcad0
       switch (ch) {
Petr Hracek 8bcad0
       case 'D':                    /* Director */
Petr Hracek 8bcad0
          if (director) {