From a7caa7f18abd421b62ed876581247186bf02be01 Mon Sep 17 00:00:00 2001
From: Marco van Wieringen <marco.van.wieringen@bareos.com>
Date: Thu, 16 May 2013 17:17:57 +0200
Subject: [PATCH] Import external changes for manpages and unused flags.

---
 manpages/bareos-dir.8 | 3 +++
 manpages/bareos-fd.8  | 6 +++---
 manpages/bareos-sd.8  | 3 +++
 manpages/bconsole.8   | 9 +++++++++
 manpages/btape.8      | 3 ---
 src/console/console.c | 2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/manpages/bareos-dir.8 b/manpages/bareos-dir.8
index a427c388d9e..a7efa08e214 100644
--- a/manpages/bareos-dir.8
+++ b/manpages/bareos-dir.8
@@ -37,6 +37,9 @@ Run in foreground (for debugging).
 .BI \-g\  group
 Set the group/gid to run as.
 .TP
+.BI \-m
+Print kaboom output (for debugging)
+.TP
 .BI \-r\  job
 Run <job>.
 .TP
diff --git a/manpages/bareos-fd.8 b/manpages/bareos-fd.8
index cf4329de8f8..f261ad9c15b 100644
--- a/manpages/bareos-fd.8
+++ b/manpages/bareos-fd.8
@@ -39,12 +39,12 @@ Run in foreground (for debugging).
 .BI \-g\  group
 Set the group/gid to run as.
 .TP
-.BI \-p
-Proceed inspite of I/O errors
-.TP
 .BI \-k
 Keep readall permission when dropping privileges.
 .TP
+.BI \-m
+Print kaboom output (for debugging)
+.TP
 .BI \-s
 No signals (for debugging).
 .TP
diff --git a/manpages/bareos-sd.8 b/manpages/bareos-sd.8
index cba9575b8d7..8e850c0d176 100644
--- a/manpages/bareos-sd.8
+++ b/manpages/bareos-sd.8
@@ -40,6 +40,9 @@ Set the group/gid to run as.
 .BI \-p
 Proceed in spite of I/O errors
 .TP
+.BI \-m
+Print kaboom output (for debugging)
+.TP
 .BI \-s
 No signals (for debugging).
 .TP
diff --git a/manpages/bconsole.8 b/manpages/bconsole.8
index 5b71bf4e3d9..b29340041ef 100644
--- a/manpages/bconsole.8
+++ b/manpages/bconsole.8
@@ -18,6 +18,12 @@ command.
 .PP
 .SH OPTIONS
 .TP
+.BI \-D\  dir
+Select a Director.
+.TP
+.BI \-l
+List defined Directors.
+.TP
 .BI \-c\  config
 Specify configuration file.
 .TP
@@ -33,6 +39,9 @@ No conio (for scripting).
 .B \-s
 No signals (for debugging).
 .TP
+.b \-u\  nn
+Set command execution timeout to \fInn\fP seconds
+.TP
 .B \-t
 Test the configuration file and report errors.
 .TP
diff --git a/manpages/btape.8 b/manpages/btape.8
index 7667222eb5c..ce6634cf708 100644
--- a/manpages/btape.8
+++ b/manpages/btape.8
@@ -38,9 +38,6 @@ Set debug level to \fInn\fP.
 .BI \-p
 Proceed inspite of I/O errors.
 .TP
-.B \-t
-Open the default tape device.
-.TP
 .B \-s
 No signals (for debugging).
 .TP
diff --git a/src/console/console.c b/src/console/console.c
index f1837bc6f13..7a6d9b182d6 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -1042,7 +1042,7 @@ int main(int argc, char *argv[])
    working_directory = "/tmp";
    args = get_pool_memory(PM_FNAME);
 
-   while ((ch = getopt(argc, argv, "D:lbc:d:nstu:?")) != -1) {
+   while ((ch = getopt(argc, argv, "D:lc:d:nstu:?")) != -1) {
       switch (ch) {
       case 'D':                    /* Director */
          if (director) {