From a043f2d79488cdfbc4d97ac0bad4926d29bf9a82 Mon Sep 17 00:00:00 2001
From: "Ondrej Zajicek (work)" <santiago@crfreenet.org>
Date: Fri, 24 Aug 2018 18:54:27 +0200
Subject: [PATCH 1/2] Doc: Fix description of 'description'

Thanks to Clemens Schrimpe for the bugreport.
---
 doc/bird.sgml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/bird.sgml b/doc/bird.sgml
index 0057d2c5..fdfae2a6 100644
--- a/doc/bird.sgml
+++ b/doc/bird.sgml
@@ -653,7 +653,7 @@ agreement").
 
 	<tag><label id="proto-description">description "<m/text/"</tag>
 	This is an optional description of the protocol. It is displayed as a
-	part of the output of 'show route all' command.
+	part of the output of 'show protocols all' command.
 
 	<tag><label id="proto-vrf">vrf "<m/text/"</tag>
 	Associate the protocol with specific VRF. The protocol will be

From 89b0af3978caf15e1478922a8d9d4f7e38145a61 Mon Sep 17 00:00:00 2001
From: Jan Maria Matejka <mq@ucw.cz>
Date: Tue, 28 Aug 2018 16:45:50 +0200
Subject: [PATCH 2/2] Main: Add -b to force background even in debug mode

---
 sysdep/unix/main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c
index ea1476e7..0912a9c5 100644
--- a/sysdep/unix/main.c
+++ b/sysdep/unix/main.c
@@ -624,7 +624,7 @@ signal_init(void)
  *	Parsing of command-line arguments
  */
 
-static char *opt_list = "c:dD:ps:P:u:g:flRh";
+static char *opt_list = "bc:dD:ps:P:u:g:flRh";
 static int parse_and_exit;
 char *bird_name;
 static char *use_user;
@@ -645,6 +645,7 @@ display_help(void)
   fprintf(stderr,
     "\n"
     "Options: \n"
+    "  -b                   Run bird in background\n"
     "  -c <config-file>     Use given configuration file instead\n"
     "                       of prefix/etc/bird.conf\n"
     "  -d                   Enable debug messages and run bird in foreground\n"
@@ -749,16 +750,21 @@ parse_args(int argc, char **argv)
   while ((c = getopt(argc, argv, opt_list)) >= 0)
     switch (c)
       {
+      case 'b':
+	run_in_foreground = 0;
+	break;
       case 'c':
 	config_name = optarg;
 	config_changed = 1;
 	break;
       case 'd':
 	debug_flag |= 1;
+	run_in_foreground = 1;
 	break;
       case 'D':
 	log_init_debug(optarg);
 	debug_flag |= 2;
+	run_in_foreground = 1;
 	break;
       case 'p':
 	parse_and_exit = 1;
@@ -857,7 +863,7 @@ main(int argc, char **argv)
   if (parse_and_exit)
     exit(0);
 
-  if (!(debug_flag||run_in_foreground))
+  if (!run_in_foreground)
     {
       pid_t pid = fork();
       if (pid < 0)