From aa2bdd9aac83c8947bbae56d0fa92277ce145a4c Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 18 Sep 2012 15:00:32 -0500
Subject: [PATCH 1/2] beadm list -D and -a are not mutually exclusive anymore

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

diff --git a/beadm.1 b/beadm.1
index c4bd88a..7934eb8 100644
--- a/beadm.1
+++ b/beadm.1
@@ -38,7 +38,8 @@ destroy
 .Ao Ar beName | beName@snapshot Ac
 .Nm
 list
-.Op Fl a | Fl D
+.Op Fl a
+.Op Fl D
 .Nm
 mount
 .Ao Ar beName Ac
@@ -98,7 +99,8 @@ Specifying
 will automatically unmount without confirmation.
 .Pp
 .It Ic list
-.Op Fl a | Fl D
+.Op Fl a
+.Op Fl D
 .Pp
 Displays all boot environments.
 The Active field indicates whether the boot environment is active now (N); active on reboot (R); or both (NR).

From 0f52dc5e4c75fef264eb18691e053090263da3e2 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bryan@shatow.net>
Date: Tue, 18 Sep 2012 15:02:06 -0500
Subject: [PATCH 2/2] beadm list now requires -s for snapshot listing

---
 beadm.1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/beadm.1 b/beadm.1
index 7934eb8..332c6bc 100644
--- a/beadm.1
+++ b/beadm.1
@@ -40,6 +40,7 @@ destroy
 list
 .Op Fl a
 .Op Fl D
+.Op Fl s
 .Nm
 mount
 .Ao Ar beName Ac
@@ -101,16 +102,20 @@ will automatically unmount without confirmation.
 .It Ic list
 .Op Fl a
 .Op Fl D
+.Op Fl s
 .Pp
 Displays all boot environments.
 The Active field indicates whether the boot environment is active now (N); active on reboot (R); or both (NR).
 .PP
 If
 .Fl a
-is used, display all datasets and snapshots as well.
+is used, display all datasets.
 If
 .Fl D
 is used, display the full space usage for each boot environment, assuming all other boot environments were destroyed.
+If
+.Fl s
+is used, display all snapshots as well.
 .Pp
 .It Ic mount
 .Ao Ar beName Ac