From d709f2a448896745627b78e939baa9715d14a63c Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Wed, 29 Aug 2012 08:15:46 -0500
Subject: [PATCH 1/6] Remove `beadm mount` and add `beadm list -a`

---
 beadm.1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/beadm.1 b/beadm.1
index 9b94b9b..9926b5a 100644
--- a/beadm.1
+++ b/beadm.1
@@ -15,7 +15,7 @@
 .\"     @(#)beadm.1
 .\" $FreeBSD$
 .\"
-.Dd June 26, 2012
+.Dd August 29, 2012
 .Dt BEADM 1
 .Os FreeBSD
 .Sh NAME
@@ -38,8 +38,7 @@ destroy
 .Ao Ar beName | beName@snapshot Ac
 .Nm
 list
-.Nm
-mount
+.Op Fl a
 .Nm
 mount
 .Ao Ar beName Ac
@@ -99,12 +98,13 @@ Specifying
 will automatically unmount without confirmation.
 .Pp
 .It Ic list
+.Op Fl a
 .Pp
 Displays all boot environments.
 .PP
-.It Ic mount
-.Pp
-List all mounted datasets for the current boot environment.
+If
+.Fl a
+is used, display snapshots as well.
 .Pp
 .It Ic mount
 .Ao Ar beName Ac

From 0783c438ea629073acba26f0e51f046028da80b2 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 4 Sep 2012 23:45:00 -0500
Subject: [PATCH 2/6] Add `beadm list -D`

---
 beadm.1 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/beadm.1 b/beadm.1
index 9926b5a..256062a 100644
--- a/beadm.1
+++ b/beadm.1
@@ -15,7 +15,7 @@
 .\"     @(#)beadm.1
 .\" $FreeBSD$
 .\"
-.Dd August 29, 2012
+.Dd September 4, 2012
 .Dt BEADM 1
 .Os FreeBSD
 .Sh NAME
@@ -38,7 +38,7 @@ destroy
 .Ao Ar beName | beName@snapshot Ac
 .Nm
 list
-.Op Fl a
+.Op Fl a | Fl D
 .Nm
 mount
 .Ao Ar beName Ac
@@ -98,13 +98,16 @@ Specifying
 will automatically unmount without confirmation.
 .Pp
 .It Ic list
-.Op Fl a
+.Op Fl a | Fl D
 .Pp
 Displays all boot environments.
 .PP
 If
 .Fl a
 is used, display snapshots as well.
+If
+.Fl D
+is used, display the full space usage for each boot environment, assuming all other boot environments were destroyed.
 .Pp
 .It Ic mount
 .Ao Ar beName Ac

From 72f6cd9507e3971eea161d315e5745d24dee4c8e Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 4 Sep 2012 23:50:05 -0500
Subject: [PATCH 3/6] Sort subcommand usage

---
 beadm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beadm b/beadm
index aa8f8f9..310f4e6 100755
--- a/beadm
+++ b/beadm
@@ -45,9 +45,9 @@ __usage() {
   echo "  ${NAME} list [-a]"
   echo "  ${NAME} list [-D]"
   echo "  ${NAME} mount beName [mountpoint]"
+  echo "  ${NAME} rename origBeName newBeName"
   echo "  ${NAME} umount [-f] beName"
   echo "  ${NAME} unmount [-f] beName"
-  echo "  ${NAME} rename origBeName newBeName"
   exit 1
 }
 

From d8a5581df7a8da523f9837d6b023010c3e6ed5d7 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Wed, 5 Sep 2012 00:01:41 -0500
Subject: [PATCH 4/6] Add colons

---
 beadm.1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/beadm.1 b/beadm.1
index 256062a..3c3b551 100644
--- a/beadm.1
+++ b/beadm.1
@@ -142,12 +142,12 @@ Perform a system upgrade in a
 .Xr jail 8
 .Pp
 Create a new boot environment called
-.Em jailed
+.Em jailed :
 .Pp
 .Dl beadm create -e default jailed
 .Pp
 Set mountpoint for new jail to
-.Pa /usr/jails/jailed
+.Pa /usr/jails/jailed :
 .Pp
 .Dl zfs set mountpoint=/usr/jails/jailed zroot/ROOT/jailed
 .Pp

From 4763c436acbe8773d3e6443c84a39c8e9c74ddde Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Wed, 5 Sep 2012 00:01:54 -0500
Subject: [PATCH 5/6] Use `beadm mount` instead of `zfs mount` here

---
 beadm.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beadm.1 b/beadm.1
index 3c3b551..3588348 100644
--- a/beadm.1
+++ b/beadm.1
@@ -149,7 +149,7 @@ Create a new boot environment called
 Set mountpoint for new jail to
 .Pa /usr/jails/jailed :
 .Pp
-.Dl zfs set mountpoint=/usr/jails/jailed zroot/ROOT/jailed
+.Dl beadm mount jailed /usr/jails/jailed
 .Pp
 The currently active boot environment is now replicated into the jailed system and ready for upgrade.
 Startup the jail, login and perform the normal upgrade process.

From 481be895c3481a56076ec8880be5e02635d0bba0 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Wed, 5 Sep 2012 00:03:39 -0500
Subject: [PATCH 6/6] Clarify `beadm list -a`

---
 beadm.1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/beadm.1 b/beadm.1
index 3588348..9b3a711 100644
--- a/beadm.1
+++ b/beadm.1
@@ -104,7 +104,7 @@ Displays all boot environments.
 .PP
 If
 .Fl a
-is used, display snapshots as well.
+is used, display all datasets and snapshots as well.
 If
 .Fl D
 is used, display the full space usage for each boot environment, assuming all other boot environments were destroyed.