sort options and sync usage(); from Igor Sobrado

also fix a misplaced .El

2 files changed, 34 insertions, 35 deletions

diff --git a/usr.sbin/amd/amd/amd.8 b/usr.sbin/amd/amd/amd.8
index 73f38adfe16..69c0304d12a 100644
--- a/usr.sbin/amd/amd/amd.8
+++ b/usr.sbin/amd/amd/amd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: amd.8,v 1.16 2003/06/12 12:59:49 jmc Exp $
+.\"	$OpenBSD: amd.8,v 1.17 2007/02/18 08:18:03 jmc Exp $
 .\"
 .\" Copyright (c) 1989 Jan-Simon Pendry
 .\" Copyright (c) 1989 Imperial College of Science, Technology & Medicine
@@ -45,7 +45,9 @@
 .Bk -words
 .Op Fl nprv
 .Op Fl a Ar mount_point
+.Op Fl C Ar cluster-name
 .Op Fl c Ar duration
+.Op Fl D Ar option
 .Op Fl d Ar domain
 .Op Fl k Ar kernel-arch
 .Op Fl l Ar logfile
@@ -53,12 +55,7 @@
 .Op Fl w Ar interval
 .Op Fl x Ar log-option
 .Op Fl y Ar YP-domain
-.Op Fl C Ar cluster-name
-.Op Fl D Ar option
-.Oo
-.Ar directory mapname
-.Op Fl map-options
-.Oc
+.Op Ar directory mapname Op Fl map-options
 .Ar ...
 .Ek
 .Sh DESCRIPTION
@@ -85,7 +82,7 @@ and some mount options for the given filesystem.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl a Ar temporary-directory
+.It Fl a Ar mount_point
 Specify an alternative location for the real mount points.
 The default is
 .Pa /a .
@@ -95,6 +92,22 @@ Specify a
 in seconds, that a looked up name remains
 cached when not in use.
 The default is 5 minutes.
+.It Fl D Ar option
+Select from a variety of debug options.
+Prefixing an option with the string
+.Dq no
+reverses the effect of that option.
+Options are cumulative.
+The most useful option is
+.Ar all .
+.Pp
+Since
+.Fl D
+is only used for debugging, other options are not documented here:
+the current supported set of options is listed by the
+.Fl v
+option
+and a fuller description is available in the program source.
 .It Fl d Ar domain
 Specify the local domain name.
 If this option is not given the domain name is determined from the hostname.
@@ -150,7 +163,11 @@ Specify an
 in seconds, between attempts to dismount
 filesystems that have exceeded their cached times.
 The default is 2 minutes.
-.It Fl y Ar domain
+.It Fl x Ar log-option
+Specify run-time logging options.
+The options are a comma separated
+list chosen from: fatal, error, user, warn, info, map, stats, all.
+.It Fl y Ar YP-domain
 Specify an alternative
 .Tn NIS
 domain from which to fetch the
@@ -160,27 +177,7 @@ The default is the system domain name.
 This option is ignored if
 .Tn NIS
 support is not available.
-.It Fl x Ar options
-Specify run-time logging options.
-The options are a comma separated
-list chosen from: fatal, error, user, warn, info, map, stats, all.
-.It Fl D Ar option
-Select from a variety of debug options.
-Prefixing an option with the string
-.Dq no
-reverses the effect of that option.
-Options are cumulative.
-The most useful option is
-.Ar all .
 .El
-.Pp
-Since
-.Fl D
-is only used for debugging, other options are not documented here:
-the current supported set of options is listed by the
-.Fl v
-option
-and a fuller description is available in the program source.
 .Sh FILES
 .Bl -tag -width /axx
 .It Pa /a
diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c
index ea5729eecf6..4db20b56d33 100644
--- a/usr.sbin/amd/amd/get_args.c
+++ b/usr.sbin/amd/amd/get_args.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)get_args.c	8.1 (Berkeley) 6/6/93
- *	$Id: get_args.c,v 1.8 2005/02/18 15:51:02 henning Exp $
+ *	$Id: get_args.c,v 1.9 2007/02/18 08:18:03 jmc Exp $
  */
 
 /*
@@ -306,16 +306,18 @@ get_args(int c, char *v[])
 
 show_usage:
 	fprintf(stderr,
-	    "Usage: %s [-mnprv] [-a mnt_point] [-c cache_time] [-d domain]\n"
-	    "\t[-k kernel_arch] [-l logfile|\"syslog\"] [-t afs_timeout]\n"
-	    "\t[-w wait_timeout] [-C cluster_name]", __progname);
+	    "usage: %s [-nprv] [-a mount_point] [-C cluster-name] "
+	    "[-c duration] [-D option]\n"
+	    "\t[-d domain] [-k kernel-arch] [-l logfile] "
+	    "[-t interval.interval]\n"
+	    "\t[-w interval]", __progname);
 
 #if defined(HAS_HOST) && defined(HOST_EXEC)
 	fputs(" [-h host_helper]\n", stderr);
 #endif /* defined(HAS_HOST) && defined(HOST_EXEC) */
 
 #ifdef HAS_NIS_MAPS
-	fputs(" [-y nis-domain]\n", stderr);
+	fputs(" [-y YP-domain]\n", stderr);
 #else
 	fputc('\n', stderr);
 #endif /* HAS_NIS_MAPS */
@@ -324,6 +326,6 @@ show_usage:
 #ifdef DEBUG
 	show_opts('D', dbg_opt);
 #endif /* DEBUG */
-	fprintf(stderr, "\t{directory mapname [-map_options]} ...\n");
+	fprintf(stderr, "\t[directory mapname [-map-options]] ...\n");
 	exit(1);
 }