sort options and sync usage(); from Igor Sobrado

2 files changed, 16 insertions, 16 deletions

diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index 0a184476fdb..d48ecc4959d 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: timed.8,v 1.13 2004/07/09 19:33:09 jmc Exp $
+.\"	$OpenBSD: timed.8,v 1.14 2007/02/19 22:39:57 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1991 Regents of the University of California.
 .\" All rights reserved.
@@ -38,12 +38,12 @@
 .Sh SYNOPSIS
 .Nm timed
 .Op Fl dMt
+.Op Fl F Ar host ...
+.Op Fl G Ar netgroup
 .Xo
 .Oo Fl i Ar network No \&|
 .Fl n Ar network Oc
 .Xc
-.Op Fl F Ar host ...
-.Op Fl G Ar netgroup
 .Sh DESCRIPTION
 The
 .Nm
@@ -67,16 +67,6 @@ The following options are available:
 .It Fl d
 Enable debugging mode;
 do not detach from the terminal.
-.It Fl i Ar network
-Add
-.Ar network
-to the list of networks to ignore.
-All other networks
-to which the machine is directly connected
-are used by
-.Nm timed .
-This option may be specified multiple times
-to add more than one network to the list.
 .It Fl F Ar host ...
 Create a list of trusted hosts.
 The
@@ -94,6 +84,16 @@ all hosts on the connected networks are treated as trustworthy.
 .It Fl G Ar netgroup
 Specify a netgroup of trustworthy hosts,
 in addition to any masters specified with the
+.It Fl i Ar network
+Add
+.Ar network
+to the list of networks to ignore.
+All other networks
+to which the machine is directly connected
+are used by
+.Nm timed .
+This option may be specified multiple times
+to add more than one network to the list.
 .Fl M
 flag.
 This option may only be specified once.
diff --git a/usr.sbin/timed/timed/timed.c b/usr.sbin/timed/timed/timed.c
index c11cb7161c3..0ab033492e7 100644
--- a/usr.sbin/timed/timed/timed.c
+++ b/usr.sbin/timed/timed/timed.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: timed.c,v 1.25 2005/02/17 12:33:30 aaron Exp $	*/
+/*	$OpenBSD: timed.c,v 1.26 2007/02/19 22:39:57 jmc Exp $	*/
 
 /*-
  * Copyright (c) 1985, 1993 The Regents of the University of California.
@@ -806,7 +806,7 @@ good_host_name(const char *name)
 static void
 usage(void)
 {
-	(void)fprintf(stderr, "timed: [-dMt] [-i network | -n network] "
-	    "[-F host1 host2 ...] [-G netgroup]\n");
+	(void)fprintf(stderr, "timed: [-dMt] [-F host ...] [-G netgroup] "
+	    "[-i network | -n network]\n");
 	exit(1);
 }