-a requires a separate synopsis;

from Daniel Polak via henning

ok henning

2 files changed, 11 insertions, 7 deletions

diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 0fc3e2b6b4a..10155498cdc 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chpass.1,v 1.32 2003/10/20 05:02:58 jmc Exp $
+.\"	$OpenBSD: chpass.1,v 1.33 2007/03/27 07:22:33 jmc Exp $
 .\"	$NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
 .\"
 .\" Copyright (c) 1988, 1990, 1993
@@ -41,9 +41,11 @@
 .Sh SYNOPSIS
 .Nm chpass
 .Op Fl ly
-.Op Fl a Ar list
 .Op Fl s Ar newshell
 .Op Ar user
+.Nm chpass
+.Op Fl l
+.Fl a Ar list
 .Sh DESCRIPTION
 .Nm chpass
 allows editing of the user database information associated
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index a418bbf4825..d77736dedde 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chpass.c,v 1.33 2007/01/15 08:14:21 otto Exp $	*/
+/*	$OpenBSD: chpass.c,v 1.34 2007/03/27 07:22:33 jmc Exp $	*/
 /*	$NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)chpass.c	8.4 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: chpass.c,v 1.33 2007/01/15 08:14:21 otto Exp $";
+static char rcsid[] = "$OpenBSD: chpass.c,v 1.34 2007/03/27 07:22:33 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -287,11 +287,13 @@ usage(void)
 
 #ifdef	YP
 	(void)fprintf(stderr,
-	    "usage: %s [-l%s] [-a list] [-s newshell] [user]\n",
+	    "usage: %s [-l%s] [-s newshell] [user]\n",
 	    __progname, use_yp ? "y" : "");
+	(void)fprintf(stderr,
+	    "usage: %s [-l] -a list\n", __progname);
 #else
-	(void)fprintf(stderr, "usage: %s [-a list] [-s newshell] [user]\n",
-	    __progname);
+	(void)fprintf(stderr, "usage: %s [-s newshell] [user]\n", __progname);
+	(void)fprintf(stderr, "usage: %s -a list\n", __progname);
 #endif
 	exit(1);
 }