tidy up synopsis and usage(); from Igor Sobrado

10 files changed, 50 insertions, 56 deletions

diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index e7c940e1fb6..05f1fa227ec 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: trpt.8,v 1.14 2003/06/12 12:59:53 jmc Exp $
+.\"	$OpenBSD: trpt.8,v 1.15 2007/02/18 23:22:33 jmc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,14 +37,10 @@
 .Nd transliterate protocol trace
 .Sh SYNOPSIS
 .Nm trpt
-.Op Fl a
-.Op Fl f
-.Op Fl j
-.Op Fl p Ar hex-address
-.Op Fl s
-.Op Fl t
-.Op Fl N Ar system
+.Op Fl afjst
 .Op Fl M Ar core
+.Op Fl N Ar system
+.Op Fl p Ar hex-address
 .Sh DESCRIPTION
 .Nm
 interrogates the buffer of
@@ -76,7 +72,15 @@ each time the end of the log is reached.
 .It Fl j
 Just give a list of the protocol control block
 addresses for which there are trace records.
-.It Fl p
+.It Fl M Ar core
+Extract values associated with the name list from
+.Pa core
+instead of the running kernel.
+.It Fl N Ar system
+Extract the name list from
+.Pa system
+instead of the running kernel.
+.It Fl p Ar hex-address
 Show only trace records associated with the protocol
 control block at the given address
 .Ar hex-address .
@@ -88,14 +92,6 @@ sequencing information.
 In addition to the normal output,
 print the values for all timers at each
 point in the trace.
-.It Fl M Ar core
-Extract values associated with the name list from
-.Pa core
-instead of the running kernel.
-.It Fl N Ar system
-Extract the name list from
-.Pa system
-instead of the running kernel.
 .El
 .Pp
 The recommended use of
diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c
index b8df03eded8..2dbdd748e31 100644
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trpt.c,v 1.22 2006/03/13 16:30:18 deraadt Exp $	*/
+/*	$OpenBSD: trpt.c,v 1.23 2007/02/18 23:22:33 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -447,7 +447,7 @@ void
 usage(void)
 {
 
-	(void) fprintf(stderr, "usage: %s [-afjst] [-p hex-address]"
-	    " [-N system] [-M core]\n", __progname);
+	(void) fprintf(stderr, "usage: %s [-afjst] [-M core]"
+	    " [-N system] [-p hex-address]\n", __progname);
 	exit(1);
 }
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index db5e4e50d32..bbefe314cab 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypbind.8,v 1.19 2003/06/12 12:59:54 jmc Exp $
+.\"	$OpenBSD: ypbind.8,v 1.20 2007/02/18 23:27:06 jmc Exp $
 .\"	$NetBSD: ypbind.8,v 1.2 1996/02/28 01:21:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,9 +43,9 @@
 .Nd create and maintain a binding to a YP server
 .Sh SYNOPSIS
 .Nm ypbind
+.Op Fl insecure
 .Op Fl ypset
 .Op Fl ypsetme
-.Op Fl insecure
 .Sh DESCRIPTION
 .Nm
 finds the server for a particular YP domain and stores information about it
@@ -89,6 +89,11 @@ marks the domain as bound and resumes its periodic check.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl insecure
+Permit binding to a
+.Xr ypserv 8
+on a non-reserved port.
+This is needed if receiving maps from SunOS 3.x or Ultrix.
 .It Fl ypset
 .Xr ypset 8
 may be used to change the server to which a domain is bound.
@@ -96,11 +101,6 @@ may be used to change the server to which a domain is bound.
 .Xr ypset 8
 may be used only from this machine to change the server
 to which a domain is bound.
-.It Fl insecure
-permit binding to a
-.Xr ypserv 8
-on a non-reserved port.
-This is needed if receiving maps from SunOS 3.x or Ultrix.
 .El
 .Pp
 The
diff --git a/usr.sbin/ypbind/ypbind.c b/usr.sbin/ypbind/ypbind.c
index 34784cf0481..3cfc1d564a4 100644
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypbind.c,v 1.55 2007/01/02 20:12:01 otto Exp $ */
+/*	$OpenBSD: ypbind.c,v 1.56 2007/02/18 23:27:06 jmc Exp $ */
 
 /*
  * Copyright (c) 1992, 1993, 1996, 1997, 1998 Theo de Raadt <deraadt@openbsd.org>
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ypbind.c,v 1.55 2007/01/02 20:12:01 otto Exp $";
+static char rcsid[] = "$OpenBSD: ypbind.c,v 1.56 2007/02/18 23:27:06 jmc Exp $";
 #endif
 
 #include <sys/param.h>
@@ -333,7 +333,7 @@ ypbindprog_2(struct svc_req *rqstp, SVCXPRT *transp)
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: ypbind [-ypset] [-ypsetme] [-insecure]\n");
+	fprintf(stderr, "usage: ypbind [-insecure] [-ypset] [-ypsetme]\n");
 	exit(0);
 }
 
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index 61176da39ea..514c0ad6e3f 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: yppoll.8,v 1.5 2000/11/09 17:53:29 aaron Exp $
+.\"	$OpenBSD: yppoll.8,v 1.6 2007/02/18 23:32:02 jmc Exp $
 .\"	$NetBSD: yppoll.8,v 1.3 1996/02/28 01:23:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,8 +43,8 @@
 .Nd ask version of YP map from YP server
 .Sh SYNOPSIS
 .Nm yppoll
-.Op Fl h Ar host
 .Op Fl d Ar domain
+.Op Fl h Ar host
 .Ar mapname
 .Sh DESCRIPTION
 .Nm
@@ -54,6 +54,11 @@ server for
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl d Ar domain
+Use the YP domain
+.Ar domain
+instead of the default domain as returned by
+.Xr domainname 1 .
 .It Fl h Ar host
 Ask the YP server process running on
 .Ar host
@@ -63,11 +68,6 @@ If
 .Ar host
 is not specified, the server polled is the default server returned by
 .Xr ypwhich 1 .
-.It Fl d Ar domain
-Use the YP domain
-.Ar domain
-instead of the default domain as returned by
-.Xr domainname 1 .
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
diff --git a/usr.sbin/yppoll/yppoll.c b/usr.sbin/yppoll/yppoll.c
index 901cce7ee53..936a01c37d3 100644
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppoll.c,v 1.10 2003/12/10 19:44:06 deraadt Exp $ */
+/*	$OpenBSD: yppoll.c,v 1.11 2007/02/18 23:32:02 jmc Exp $ */
 /*	$NetBSD: yppoll.c,v 1.5 1996/05/13 02:46:36 thorpej Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: yppoll.c,v 1.10 2003/12/10 19:44:06 deraadt Exp $";
+static char rcsid[] = "$Id: yppoll.c,v 1.11 2007/02/18 23:32:02 jmc Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -55,7 +55,7 @@ static char rcsid[] = "$Id: yppoll.c,v 1.10 2003/12/10 19:44:06 deraadt Exp $";
 static void
 usage(void)
 {
-	fprintf(stderr, "Usage: yppoll [-h host] [-d domainname] mapname\n");
+	fprintf(stderr, "usage: yppoll [-d domain] [-h host] mapname\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/ypserv/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv/ypserv.8
index 2fb1003c057..3eb2c85df8e 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv/ypserv.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypserv.8,v 1.22 2003/06/12 12:59:54 jmc Exp $
+.\"	$OpenBSD: ypserv.8,v 1.23 2007/02/18 23:34:57 jmc Exp $
 .\"
 .\" Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
 .\" All rights reserved.
@@ -32,10 +32,8 @@
 .Nd YP server daemon
 .Sh SYNOPSIS
 .Nm ypserv
-.Op Fl 1
+.Op Fl 1dx
 .Op Fl a Ar aclfile
-.Op Fl d
-.Op Fl x
 .Sh DESCRIPTION
 .Nm
 is a fundamental part of the network information system called YP.
diff --git a/usr.sbin/ypserv/ypserv/ypserv.c b/usr.sbin/ypserv/ypserv/ypserv.c
index f54e525c326..fb38c253b1e 100644
--- a/usr.sbin/ypserv/ypserv/ypserv.c
+++ b/usr.sbin/ypserv/ypserv/ypserv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypserv.c,v 1.34 2006/04/03 05:01:24 deraadt Exp $ */
+/*	$OpenBSD: ypserv.c,v 1.35 2007/02/18 23:34:57 jmc Exp $ */
 
 /*
  * Copyright (c) 1994 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.34 2006/04/03 05:01:24 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: ypserv.c,v 1.35 2007/02/18 23:34:57 jmc Exp $";
 #endif
 
 #include <sys/types.h>
@@ -382,7 +382,7 @@ my_svc_run(void)
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "usage: ypserv [-a aclfile] [-d] [-x]\n");
+	(void)fprintf(stderr, "usage: ypserv [-1dx] [-a aclfile]\n");
 	exit(1);
 }
 
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index c9b22bc38d2..3c3425ad59a 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ypset.8,v 1.6 2001/08/02 18:37:35 mpech Exp $
+.\"	$OpenBSD: ypset.8,v 1.7 2007/02/18 23:37:53 jmc Exp $
 .\"	$NetBSD: ypset.8,v 1.2 1996/02/28 01:25:08 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -45,8 +45,8 @@
 which YP server process to use
 .Sh SYNOPSIS
 .Nm ypset
-.Op Fl h Ar host
 .Op Fl d Ar domain
+.Op Fl h Ar host
 .Ar server
 .Sh DESCRIPTION
 .Nm
@@ -69,15 +69,15 @@ the local network supplying YP maps.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl h Ar host
-Set the YP binding on
-.Ar host
-instead of the local machine.
 .It Fl d Ar domain
 Use the YP domain
 .Ar domain
 instead of the default domain as returned by
 .Xr domainname 1 .
+.It Fl h Ar host
+Set the YP binding on
+.Ar host
+instead of the local machine.
 .El
 .Sh SEE ALSO
 .Xr domainname 1 ,
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index cbb74b45b14..0b2cb85e55c 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ypset.c,v 1.16 2007/01/02 20:13:28 otto Exp $ */
+/*	$OpenBSD: ypset.c,v 1.17 2007/02/18 23:37:53 jmc Exp $ */
 /*	$NetBSD: ypset.c,v 1.8 1996/05/13 02:46:33 thorpej Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: ypset.c,v 1.16 2007/01/02 20:13:28 otto Exp $";
+static char rcsid[] = "$OpenBSD: ypset.c,v 1.17 2007/02/18 23:37:53 jmc Exp $";
 #endif
 
 #include <sys/param.h>
@@ -50,7 +50,7 @@ static char rcsid[] = "$OpenBSD: ypset.c,v 1.16 2007/01/02 20:13:28 otto Exp $";
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: ypset [-h host ] [-d domain] server\n");
+	fprintf(stderr, "usage: ypset [-d domain] [-h host] server\n");
 	exit(1);
 }