show log/reset/stop as single commands, like usage() currently does;

ok mlarkin claudio

1 files changed, 14 insertions, 16 deletions

diff --git a/usr.sbin/vmctl/vmctl.8 b/usr.sbin/vmctl/vmctl.8
index 8cd306f6e0a..422af9e1811 100644
--- a/usr.sbin/vmctl/vmctl.8
+++ b/usr.sbin/vmctl/vmctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vmctl.8,v 1.59 2018/12/13 06:51:52 jmc Exp $
+.\"	$OpenBSD: vmctl.8,v 1.60 2018/12/18 08:04:58 jmc Exp $
 .\"
 .\" Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: December 13 2018 $
+.Dd $Mdocdate: December 18 2018 $
 .Dt VMCTL 8
 .Os
 .Sh NAME
@@ -106,10 +106,8 @@ options and will be obtained from the base or input image respectively.
 .El
 .It Cm load Ar filename
 Load additional configuration from the specified file.
-.It Cm log brief
-Disable verbose debug logging.
-.It Cm log verbose
-Enable verbose debug logging.
+.It Cm log brief | verbose
+Disable or enable verbose debug logging.
 .It Cm pause Ar id
 Pause a VM with the specified
 .Ar id .
@@ -119,12 +117,12 @@ Receive a VM from standard input and start it with the specified
 .It Cm reload
 Remove all stopped VMs and reload the configuration from the default
 configuration file.
-.It Cm reset Op Cm all
-Reset the running state.
-.It Cm reset switches
-Reset the configured switches.
-.It Cm reset vms
-Reset and terminate all VMs.
+.It Cm reset Op Cm all | switches | vms
+Reset the running state,
+reset
+.Cm switches ,
+or reset and terminate all
+.Cm vms .
 .It Cm send Ar id
 Send a VM with the specified
 .Ar id
@@ -236,9 +234,11 @@ with '.', '-' or '_'.
 .It Cm status Op Ar id
 Lists VMs running on the host, optionally listing just the selected VM
 .Ar id .
-.It Cm stop Ar id Op Fl fw
+.It Cm stop Oo Ar id | Fl a Oc Op Fl fw
 Stops (terminates) a VM defined by the specified VM
-.Ar id .
+.Ar id
+or all running VMs
+.Pq Fl a .
 By default,
 a graceful shutdown will be attempted if the VM supports the
 .Xr vmmci 4
@@ -253,8 +253,6 @@ Forcefully stop the VM without attempting a graceful shutdown.
 .It Fl w
 Wait until the VM has been terminated.
 .El
-.It Cm stop Fl a Op Fl fw
-Stop all running VMs.
 .It Cm unpause Ar id
 Unpause (resume from a paused state) a VM with the specified
 .Ar id .