From f285600b101285b3dbdf814d8c4647cd9d60bac1 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@ubuntu.com>
Date: Mon, 31 Aug 2015 08:56:15 -0500
Subject: [PATCH] * usr/bin/byobu.in, usr/share/man/man1/byobu.1: LP: #1483394 
  - byobu -h|--help enters manpage

---
 debian/changelog           | 2 ++
 usr/bin/byobu.in           | 9 +++++++++
 usr/share/man/man1/byobu.1 | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6daa1c4e..71ef9ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ byobu (5.95) unreleased; urgency=medium
     - sum together all batteries
   * usr/bin/byobu.in:
     - ensure we start tmux with unicode support, LP: #1268072
+  * usr/bin/byobu.in, usr/share/man/man1/byobu.1: LP: #1483394
+    - byobu -h|--help enters manpage
 
   [ Fortunato Ventre ]
   * usr/lib/byobu/include/constants:
diff --git a/usr/bin/byobu.in b/usr/bin/byobu.in
index 26df2620..da661297 100755
--- a/usr/bin/byobu.in
+++ b/usr/bin/byobu.in
@@ -21,6 +21,15 @@
 VERSION=5.95
 PKG="byobu"
 
+# Enter manpage if -h|--help is anywhere on the command line
+for i in $@; do
+	case "$i" in
+		-h|--help)
+			exec man $PKG
+		;;
+	esac
+done
+
 # All sorts of things go wrong if you don't own your $HOME dir.
 # This happens under sudo, if you don't use the -H option; Byobu will
 # create a bunch of files in your $HOME which will be owned by root.
diff --git a/usr/share/man/man1/byobu.1 b/usr/share/man/man1/byobu.1
index 1d58e434..1fc411fc 100644
--- a/usr/share/man/man1/byobu.1
+++ b/usr/share/man/man1/byobu.1
@@ -3,7 +3,7 @@
 byobu \- wrapper script for seeding a user's byobu configuration and launching a text based window manager (either screen or tmux)
 
 .SH SYNOPSIS
-\fBbyobu\fP [screen options]
+\fBbyobu\fP [options]
 
 \fBbyobu\-screen\fP [screen options]