sort flags; synchronize synopsis and usage; style(9).

tweaked by jmc@, thanks!

ok jmc@

6 files changed, 44 insertions, 42 deletions

diff --git a/share/man/man8/yp.8 b/share/man/man8/yp.8
index 6ad7ee2e869..359850a29bc 100644
--- a/share/man/man8/yp.8
+++ b/share/man/man8/yp.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yp.8,v 1.25 2008/04/03 07:01:28 jmc Exp $
+.\"	$OpenBSD: yp.8,v 1.26 2008/06/01 21:45:08 sobrado Exp $
 .\"	$NetBSD: yp.8,v 1.9 1995/08/11 01:16:52 thorpej Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1996 Theo de Raadt <deraadt@theos.com>
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: April 3 2008 $
+.Dd $Mdocdate: June 1 2008 $
 .Dt YP 8
 .Os
 .Sh NAME
@@ -33,26 +33,25 @@
 .Nd description of the YP subsystem
 .Sh SYNOPSIS
 .Nm ypinit
-.Op Fl m
-.Ar domain
+.Fl m Op Ar domainname
 .Nm ypinit
-.Op Fl s
-.Ar server
-.Ar domain
+.Fl s Ar master_server Op Ar domainname
+.Nm ypinit
+.Fl u Op Ar domainname
 .Pp
 .Nm ypbind
+.Op Fl insecure
 .Op Fl ypset
-.Nm ypbind
 .Op Fl ypsetme
 .Pp
 .Nm ypset
-.Op Fl h Ar host
 .Op Fl d Ar domain
+.Op Fl h Ar host
 .Ar server
 .Pp
 .Nm yppoll
-.Op Fl h Ar host
 .Op Fl d Ar domain
+.Op Fl h Ar host
 .Ar mapname
 .Pp
 .Nm ypcat
@@ -81,33 +80,32 @@
 .Fl x
 .Pp
 .Nm ypserv
+.Op Fl 1dx
 .Op Fl a Ar aclfile
-.Op Fl d
-.Op Fl x
 .Pp
 .Nm ypxfr
-.Op Fl bcf
+.Op Fl cf
+.Op Fl C Ar tid prog ipadd port
 .Op Fl d Ar domain
 .Op Fl h Ar host
 .Op Fl s Ar domain
-.Op Fl C Ar tid prog ipadd port
 .Ar mapname
 .Pp
 .Nm yppush
+.Op Fl v
 .Op Fl d Ar domainname
 .Op Fl h Ar hostname
 .\" .Op Fl p Ar paralleljobs
 .\" .Op Fl t Ar timeout
-.Op Fl v
 .Ar mapname
 .Pp
 .Nm rpc.yppasswdd
 .Bk -words
-.Op Fl d Ar directory
-.Op Fl noshell
 .Op Fl nogecos
 .Op Fl nopw
-.Op Fl m Ar arg1 Ar arg2 Ar ...
+.Op Fl noshell
+.Op Fl d Ar directory
+.Op Fl m Ar arg ...
 .Ek
 .Sh DESCRIPTION
 The
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index caaaa9e89f6..d8baa8bdf34 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypmatch.c,v 1.12 2006/04/02 01:49:19 deraadt Exp $ */
+/*	$OpenBSD: ypmatch.c,v 1.13 2008/06/01 21:45:08 sobrado Exp $ */
 /*	$NetBSD: ypmatch.c,v 1.8 1996/05/07 01:24:52 jtc Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.12 2006/04/02 01:49:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ypmatch.c,v 1.13 2008/06/01 21:45:08 sobrado Exp $";
 #endif
 
 #include <sys/param.h>
@@ -63,14 +63,15 @@ struct ypalias {
 void
 usage(void)
 {
-	fprintf(stderr, "Usage:\n");
-	fprintf(stderr, "\typmatch [-d domain] [-t] [-k] key [key ...] mname\n");
-	fprintf(stderr, "\typmatch -x\n");
-	fprintf(stderr, "where\n");
-	fprintf(stderr, "\tmname may be either a mapname or a nickname for a map\n");
-	fprintf(stderr, "\t-t inhibits map nickname translation\n");
-	fprintf(stderr, "\t-k prints keys as well as values.\n");
-	fprintf(stderr, "\t-x dumps the map nickname translation table.\n");
+	fprintf(stderr,
+	    "usage: ypmatch [-kt] [-d domain] key ... mapname\n"
+	    "       ypmatch -x\n");
+	fprintf(stderr,
+	    "where\n"
+	    "\tmapname may be either a mapname or a nickname for a map.\n"
+	    "\t-k prints keys as well as values.\n"
+	    "\t-t inhibits map nickname translation.\n"
+	    "\t-x dumps the map nickname translation table.\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/ypserv/yppush/yppush.8 b/usr.sbin/ypserv/yppush/yppush.8
index b8e69413148..f2cc4a568ff 100644
--- a/usr.sbin/ypserv/yppush/yppush.8
+++ b/usr.sbin/ypserv/yppush/yppush.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yppush.8,v 1.12 2007/05/31 19:20:31 jmc Exp $
+.\"	$OpenBSD: yppush.8,v 1.13 2008/06/01 21:45:08 sobrado Exp $
 .\"
 .\" Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2008 $
 .Dt YPPUSH 8
 .Os
 .Sh NAME
@@ -32,11 +32,11 @@
 .Nd force distribution of YP map
 .Sh SYNOPSIS
 .Nm yppush
+.Op Fl v
 .Op Fl d Ar domainname
 .Op Fl h Ar hostname
 .\" .Op Fl p Ar paralleljobs
 .\" .Op Fl t Ar timeout
-.Op Fl v
 .Ar mapname
 .Sh DESCRIPTION
 .Nm yppush
diff --git a/usr.sbin/ypserv/yppush/yppush.c b/usr.sbin/ypserv/yppush/yppush.c
index aa07a2d6d8d..0eb6ea8f295 100644
--- a/usr.sbin/ypserv/yppush/yppush.c
+++ b/usr.sbin/ypserv/yppush/yppush.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppush.c,v 1.25 2006/09/25 05:59:28 otto Exp $ */
+/*	$OpenBSD: yppush.c,v 1.26 2008/06/01 21:45:08 sobrado Exp $ */
 
 /*
  * Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: yppush.c,v 1.25 2006/09/25 05:59:28 otto Exp $";
+static const char rcsid[] = "$OpenBSD: yppush.c,v 1.26 2008/06/01 21:45:08 sobrado Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -66,7 +66,8 @@ extern bool_t xdr_ypreq_xfr(XDR *, struct ypreq_xfr *);
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: yppush [-d domainname] [-h host] [-v] mapname\n");
+	fprintf(stderr,
+	    "usage: yppush [-v] [-d domainname] [-h hostname] mapname\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.8 b/usr.sbin/ypserv/ypxfr/ypxfr.8
index 0acbc99af91..b8fd38104a7 100644
--- a/usr.sbin/ypserv/ypxfr/ypxfr.8
+++ b/usr.sbin/ypserv/ypxfr/ypxfr.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypxfr.8,v 1.17 2007/05/31 19:20:31 jmc Exp $
+.\"	$OpenBSD: ypxfr.8,v 1.18 2008/06/01 21:45:08 sobrado Exp $
 .\"
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: ypxfr.8,v 1.17 2007/05/31 19:20:31 jmc Exp $
+.\"	$OpenBSD: ypxfr.8,v 1.18 2008/06/01 21:45:08 sobrado Exp $
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 1 2008 $
 .Dt YPXFR 8
 .Os
 .Sh NAME
@@ -35,10 +35,10 @@
 .Sh SYNOPSIS
 .Nm ypxfr
 .Op Fl cf
+.Op Fl C Ar tid prog ipadd port
 .Op Fl d Ar domain
 .Op Fl h Ar host
 .Op Fl s Ar domain
-.Op Fl C Ar tid prog ipadd port
 .Ar mapname
 .Sh DESCRIPTION
 .Nm ypxfr
diff --git a/usr.sbin/ypserv/ypxfr/ypxfr.c b/usr.sbin/ypserv/ypxfr/ypxfr.c
index f4156d9c3f1..4a9a5d87cc3 100644
--- a/usr.sbin/ypserv/ypxfr/ypxfr.c
+++ b/usr.sbin/ypserv/ypxfr/ypxfr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypxfr.c,v 1.35 2006/09/25 05:59:28 otto Exp $ */
+/*	$OpenBSD: ypxfr.c,v 1.36 2008/06/01 21:45:08 sobrado Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: ypxfr.c,v 1.35 2006/09/25 05:59:28 otto Exp $";
+static const char rcsid[] = "$OpenBSD: ypxfr.c,v 1.36 2008/06/01 21:45:08 sobrado Exp $";
 #endif
 
 #include <sys/types.h>
@@ -336,8 +336,10 @@ send_reply(CLIENT *client, u_long status, u_long tid)
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: ypxfr [-cf] [-d domain] [-h host] [-s domain] "
-	    "[-C tid prog ipadd port] mapname\n");
+	fprintf(stderr,
+	    "usage: ypxfr [-cf] [-C tid prog ipadd port] [-d domain] "
+	    "[-h host] [-s domain]\n"
+	    "             mapname\n");
 	exit(1);
 }