From 1159385c239acfbb3450f947268f0501bcd43c83 Mon Sep 17 00:00:00 2001
From: "Slawomir Wojciech Wojtczak (vermaden)" <vermaden@interia.pl>
Date: Mon, 29 Oct 2012 08:12:50 +0100
Subject: [PATCH] Minor fixes. Man page corrections.

---
 beadm   | 19 ++++++++-----------
 beadm.1 | 24 +++++++++++++++++++++---
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/beadm b/beadm
index 96c70e9..368305f 100755
--- a/beadm
+++ b/beadm
@@ -36,17 +36,14 @@ fi
 __usage() {
   local NAME=${0##*/}
   echo "usage:"
-  echo "  ${NAME} activate beName"
-  echo "  ${NAME} create [-e nonActiveBe] beName"
-  echo "  ${NAME} create [-e beName@snapshot] beName"
-  echo "  ${NAME} create beName@snapshot"
-  echo "  ${NAME} destroy [-F] beName"
-  echo "  ${NAME} destroy [-F] beName@snapshot"
+  echo "  ${NAME} activate <beName>"
+  echo "  ${NAME} create [-e nonActiveBe | -e beName@snapshot] <beName>"
+  echo "  ${NAME} create <beName@snapshot>"
+  echo "  ${NAME} destroy [-F] <beName | beName@snapshot>"
   echo "  ${NAME} list [-a] [-s] [-D] [-H]"
-  echo "  ${NAME} mount beName [mountpoint]"
-  echo "  ${NAME} umount [-f] beName"
-  echo "  ${NAME} unmount [-f] beName"
-  echo "  ${NAME} rename origBeName newBeName"
+  echo "  ${NAME} rename <origBeName> <newBeName>"
+  echo "  ${NAME} mount <beName> [mountpoint]"
+  echo "  ${NAME} { umount | unmount } [-f] <beName>"
   exit 1
 }
 
@@ -723,7 +720,7 @@ EOF
     fi
     mount \
       | awk '{print $1}' \
-      | grep "^${POOL}/ROOT/${2}(/|$)" \
+      | grep -E "^${POOL}/ROOT/${2}(/|$)" \
       | sort -n -r \
       | while read FS
         do
diff --git a/beadm.1 b/beadm.1
index ffc6294..7403d39 100644
--- a/beadm.1
+++ b/beadm.1
@@ -40,6 +40,7 @@ destroy
 list
 .Op Fl a
 .Op Fl D
+.Op Fl H
 .Op Fl s
 .Nm
 mount
@@ -191,6 +192,23 @@ A HOWTO guide is posted at the FreeBSD forums:
 .Xr beadm 1M
 originally appeared in Solaris.
 .Sh AUTHORS
-.An Slawomir Wojciech Wojtczak (vermaden) Aq vermaden@interia.pl
-.An Bryan Drewery Aq bryan@shatow.net
-wrote this manual page and contributed child dataset fixes
+.Bl -bullet
+.It
+Slawomir Wojciech Wojtczak (vermaden)
+.Ar vermaden@interia.pl
+.Pp
+Creator and maintainer of
+.Nm .
+.It
+Bryan Drewery (bdrewery)
+.Ar bryan@shatow.net
+.Pp
+Wrote this manual page and contributed child dataset fixes.
+.It
+Mike Clarke (rawthey)
+.Ar jmc-fbsd@milibyte.co.uk
+.Pp
+Wrote fast implementation of
+.Nm Ar list .
+.Pp
+Contributed a lot of fixes and usability changes.