summaryrefslogtreecommitdiff
path: root/bin/ps
diff options
context:
space:
mode:
Diffstat (limited to 'bin/ps')
-rw-r--r--bin/ps/ps.16
-rw-r--r--bin/ps/ps.c6
2 files changed, 7 insertions, 5 deletions
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 235c6a95ebe..99d69a7410d 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ps.1,v 1.28 2000/11/09 23:47:17 aaron Exp $
+.\" $OpenBSD: ps.1,v 1.29 2001/02/05 00:30:45 deraadt Exp $
.\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -42,7 +42,9 @@
.Nd process status
.Sh SYNOPSIS
.Nm ps
-.Op Fl acCehjklmrSTuvwx
+.Sm off
+.Oo \&- Oc Op acCehjklmrSTuvwx
+.Sm on
.Op Fl M Ar core
.Op Fl N Ar system
.Op Fl O Ar fmt
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index a4a639864a8..7228779f24e 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ps.c,v 1.14 2000/06/18 17:59:54 niklas Exp $ */
+/* $OpenBSD: ps.c,v 1.15 2001/02/05 00:30:45 deraadt Exp $ */
/* $NetBSD: ps.c,v 1.15 1995/05/18 20:33:25 mycroft Exp $ */
/*-
@@ -44,7 +44,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.14 2000/06/18 17:59:54 niklas Exp $";
+static char rcsid[] = "$OpenBSD: ps.c,v 1.15 2001/02/05 00:30:45 deraadt Exp $";
#endif
#endif /* not lint */
@@ -495,7 +495,7 @@ usage()
(void)fprintf(stderr,
"usage:\t%s\n\t %s\n\t%s\n",
- "ps [-aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]",
+ "ps [[-]aChjlmrSTuvwx] [-O|o fmt] [-p pid] [-t tty] [-U user]",
"[-M core] [-N system] [-W swap]",
"ps [-L]");
exit(1);