sort options + sync usage();

2 files changed, 11 insertions, 11 deletions

diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 92f67660ca4..75ca85dbd8f 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shutdown.8,v 1.35 2005/03/09 13:52:20 aoyama Exp $
+.\"	$OpenBSD: shutdown.8,v 1.36 2005/05/19 09:28:24 jmc Exp $
 .\"	$NetBSD: shutdown.8,v 1.6 1995/03/18 15:01:07 cgd Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
@@ -39,7 +39,7 @@
 .Sh SYNOPSIS
 .Nm shutdown
 .Op Fl
-.Op Fl dfhkrnp
+.Op Fl dfhknpr
 .Ar time
 .Op Ar warning-message ...
 .Sh DESCRIPTION
@@ -99,12 +99,6 @@ or
 prevents the normal
 .Xr sync 2
 before stopping the system.
-.It Fl r
-.Nm
-execs
-.Xr reboot 8
-at the specified
-.Ar time .
 .It Fl p
 The
 .Fl p
@@ -113,6 +107,12 @@ flag is passed on to
 causing machines which support automatic power down to do so after halting.
 (Currently supported on some i386, luna88k, mac68k, macppc, sparc,
 sparc64 and zaurus platforms.)
+.It Fl r
+.Nm
+execs
+.Xr reboot 8
+at the specified
+.Ar time .
 .It Ar time
 .Ar time
 is the time at which
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index d46b09ef50a..2b3b81a3bc4 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shutdown.c,v 1.31 2004/01/24 19:14:09 deraadt Exp $	*/
+/*	$OpenBSD: shutdown.c,v 1.32 2005/05/19 09:28:24 jmc Exp $	*/
 /*	$NetBSD: shutdown.c,v 1.9 1995/03/18 15:01:09 cgd Exp $	*/
 
 /*
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)shutdown.c	8.2 (Berkeley) 2/16/94";
 #else
-static char rcsid[] = "$OpenBSD: shutdown.c,v 1.31 2004/01/24 19:14:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: shutdown.c,v 1.32 2005/05/19 09:28:24 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -558,6 +558,6 @@ badtime(void)
 void
 usage(void)
 {
-	fprintf(stderr, "usage: shutdown [-dfhknpr] shutdowntime [ message ]\n");
+	fprintf(stderr, "usage: shutdown [-] [-dfhknpr] time [warning-message ...]\n");
 	exit(1);
 }