simplify synopsis and sync usage();

2 files changed, 5 insertions, 8 deletions

diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 94743a33ab5..5503295d338 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ps.1,v 1.54 2005/09/06 23:28:23 jmc Exp $
+.\"	$OpenBSD: ps.1,v 1.55 2006/11/01 19:07:18 jmc Exp $
 .\"	$NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -39,7 +39,7 @@
 .Sh SYNOPSIS
 .Nm ps
 .Sm off
-.Oo \&- Oc Op Cm aCcehjklmrSTuvwx
+.Op Fl aCcehjkLlmrSTuvwx
 .Sm on
 .Op Fl M Ar core
 .Op Fl N Ar system
@@ -49,8 +49,6 @@
 .Op Fl t Ar tty
 .Op Fl U Ar username
 .Op Fl W Ar swap
-.Nm ps
-.Op Fl L
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index ef1cd971d03..db576ae97cf 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ps.c,v 1.41 2006/04/25 15:41:07 deraadt Exp $	*/
+/*	$OpenBSD: ps.c,v 1.42 2006/11/01 19:07:18 jmc Exp $	*/
 /*	$NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $	*/
 
 /*-
@@ -40,7 +40,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ps.c	8.4 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: ps.c,v 1.41 2006/04/25 15:41:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ps.c,v 1.42 2006/11/01 19:07:18 jmc Exp $";
 #endif
 #endif /* not lint */
 
@@ -490,10 +490,9 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: %s [-][aCcehjklmrSTuvwx] [-M core] [-N system] [-O fmt] [-o fmt] [-p pid]\n",
+	    "usage: %s [-aCcehjkLlmrSTuvwx] [-M core] [-N system] [-O fmt] [-o fmt] [-p pid]\n",
 	    __progname);	
 	(void)fprintf(stderr,
 	    "%-*s[-t tty] [-U username] [-W swap]\n", strlen(__progname) + 8, "");
-	(void)fprintf(stderr, "       %s [-L]\n", __progname);
 	exit(1);
 }