From 1841a05df3b6b9fc91362b50926903556eb00b77 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 26 Jun 2012 21:16:34 -0500
Subject: [PATCH 1/4] Document beadm destroy -F

---
 beadm.1 | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/beadm.1 b/beadm.1
index 7bb30fd..3b701b4 100644
--- a/beadm.1
+++ b/beadm.1
@@ -15,7 +15,7 @@
 .\"     @(#)beadm.1
 .\" $FreeBSD$
 .\"
-.Dd April 26, 2012
+.Dd June 26, 2012
 .Dt BEADM 1
 .Os FreeBSD
 .Sh NAME
@@ -34,10 +34,8 @@ create
 .Ao Ar beName@snapshot Ac
 .Nm
 destroy
-.Ao Ar beName Ac
-.Nm
-destroy
-.Ao Ar beName@snapshot Ac
+.Op Fl F
+.Ao Ar beName | beName@snapshot Ac
 .Nm
 list
 .Nm
@@ -77,16 +75,18 @@ If the -e param is specified, the new environment will be cloned from the given
 Creates a snapshot of the existing boot environment named
 .Ar beName .
 .Pp
-.It Ic destroy Ao Ar beName Ac
+.It
+.Ic destroy Op Fl F
+.Ao Ar beName | beName@snapshot Ac
 .Pp
 Destroys the given
 .Ar beName
-boot environment.
-.It Ic destroy Ao Ar beName@snapshot Ac
-.Pp
-Destroys the given
+boot environment or
 .Ar beName@snapshot
 snapshot.
+Specifying
+.Fl F
+will automatically unmount without confirmation.
 .Pp
 .It Ic list
 .Pp

From 1cfdc20457c12339aef8df58b80e845fd78a3773 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 26 Jun 2012 21:16:54 -0500
Subject: [PATCH 2/4] Fix -e not showing for beadm create beName@snapshot

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

diff --git a/beadm.1 b/beadm.1
index 3b701b4..f823068 100644
--- a/beadm.1
+++ b/beadm.1
@@ -27,7 +27,7 @@ activate
 .Ao Ar beName Ac
 .Nm
 create
-.Op Fl e Ar nonActiveBe | Ar beName@snapshot
+.Op Fl e Ar nonActiveBe | Fl e Ar beName@snapshot
 .Ao Ar beName Ac
 .Nm
 create
@@ -61,7 +61,7 @@ Activate the given
 for the next boot.
 .Pp
 .It Ic create
-.Op Fl e Ar nonActiveBe | Ar beName@snapshot
+.Op Fl e Ar nonActiveBe | Fl e Ar beName@snapshot
 .Ao Ar beName Ac
 .Pp
 Creates a new boot environment named

From 3edb3f232817777a22d68e8d19d793b9b9c35f20 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 26 Jun 2012 21:48:35 -0500
Subject: [PATCH 3/4] Document beadm mount

---
 beadm.1 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/beadm.1 b/beadm.1
index f823068..508a2c3 100644
--- a/beadm.1
+++ b/beadm.1
@@ -39,6 +39,12 @@ destroy
 .Nm
 list
 .Nm
+mount
+.Nm
+mount
+.Ao Ar beName Ac
+.Op mountpoint
+.Nm
 rename
 .Ao Ar origBeName Ac
 .Ao Ar newBeName Ac
@@ -91,6 +97,19 @@ will automatically unmount without confirmation.
 .It Ic list
 .Pp
 Displays all boot environments.
+.PP
+.It Ic mount
+.Pp
+List all mounted datasets for the current boot environment.
+.Pp
+.It Ic mount
+.Ao Ar beName Ac
+.Op mountpoint
+.Pp
+Temporarily mount the boot environment.
+Mount at the specified
+.Ar mountpoint
+if provided.
 .Pp
 .It Ic rename Ao Ar origBeName Ac Ao Ar newBeName Ac
 .Pp

From 1bff1707cb1619e40e90d1ee6ad06eef440ade2d Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 26 Jun 2012 21:58:45 -0500
Subject: [PATCH 4/4] Document beadm unmount

---
 beadm.1 | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/beadm.1 b/beadm.1
index 508a2c3..9b94b9b 100644
--- a/beadm.1
+++ b/beadm.1
@@ -48,6 +48,10 @@ mount
 rename
 .Ao Ar origBeName Ac
 .Ao Ar newBeName Ac
+.Nm
+{ umount | unmount }
+.Op Fl f
+.Ao Ar beName Ac
 .Sh DESCRIPTION
 The
 .Nm
@@ -118,6 +122,15 @@ Renames the given nonactive
 to the given
 .Ar newBeName
 .Pp
+.It Ic umount
+.Op Fl f
+.Ao Ar beName Ac
+.Pp
+Unmount the given boot environment, if it is mounted.
+Specifying
+.Fl f
+will force the unmount if busy.
+.Pp
 .El
 .Sh EXAMPLES
 .Bl -bullet