From: schwarze <schwarze@openbsd.org>
Date: Tue, 6 Oct 2015 18:46:05 +0000 (+0000)
Subject: With growing functionality, the synopsis became long and confusing.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=aa7681c9e54121b226dc747fb5ced23a510f25d9;p=openbsd

With growing functionality, the synopsis became long and confusing.
The syntax of some subcommands has almost nothing in common with the
syntax of others.  So split the synopsis to make it more readable.
"if you feel it helps, go for it"  jmc@ ajacoutot@
---

diff --git a/usr.sbin/rcctl/rcctl.8 b/usr.sbin/rcctl/rcctl.8
index b14f1e3bd5a..78f6d4611cd 100644
--- a/usr.sbin/rcctl/rcctl.8
+++ b/usr.sbin/rcctl/rcctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcctl.8,v 1.23 2015/10/06 18:35:55 schwarze Exp $
+.\"	$OpenBSD: rcctl.8,v 1.24 2015/10/06 18:46:05 schwarze Exp $
 .\"
 .\" Copyright (c) 2014 Antoine Jacoutot <ajacoutot@openbsd.org>
 .\"
@@ -22,11 +22,17 @@
 .Nd configure and control daemons and services
 .Sh SYNOPSIS
 .Nm rcctl
+.Cm get Ns | Ns Cm getdef Ns | Ns Cm set
+.Ar service | daemon Op Ar variable Op Ar arguments
+.Nm rcctl
 .Op Fl df
-.Sm off
-.Ar action | Cm get | getdef | ls | order | set
-.Sm on
-.Op Ar service | daemon Oo Ar variable Oo Ar arguments Oc Oc | Ar daemons | lsarg
+.Ar action daemon ...
+.Nm rcctl
+.Cm order
+.Op Ar daemon ...
+.Nm rcctl
+.Cm ls
+.Ar lsarg
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/usr.sbin/rcctl/rcctl.sh b/usr.sbin/rcctl/rcctl.sh
index 502fefee404..73ad2f0751d 100644
--- a/usr.sbin/rcctl/rcctl.sh
+++ b/usr.sbin/rcctl/rcctl.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: rcctl.sh,v 1.81 2015/10/04 13:38:11 ajacoutot Exp $
+# $OpenBSD: rcctl.sh,v 1.82 2015/10/06 18:46:05 schwarze Exp $
 #
 # Copyright (c) 2014, 2015 Antoine Jacoutot <ajacoutot@openbsd.org>
 # Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,8 +28,11 @@ _rc_parse_conf
 
 usage()
 {
-	_rc_err "usage: ${0##*/} [-df] action|get|getdef|ls|order|set
-             [service | daemon [variable [arguments]] | daemons | lsarg]"
+	_rc_err \
+	"usage:	rcctl get|getdef|set service | daemon [variable [arguments]]
+	rcctl [-df] action daemon ...
+	rcctl order [daemon ...]
+	rcctl ls lsarg"
 }
 
 needs_root()