diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2007-05-29 18:29:27 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2007-05-29 18:29:27 +0000 |
| commit | b37cb5c3614a7334062944a0f478a3c1300e2e45 (patch) | |
| tree | bbf892771211de4a3b4655675fd1f528eba00910 /usr.bin | |
| parent | dd0f4815faf255a15a5149f166199afafa0c96fe (diff) | |
remove -j from SYNOPSIS and usage(); it's deprecated and already
documented in STANDARDS;
ok otto
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/join/join.1 | 3 | ||||
| -rw-r--r-- | usr.bin/join/join.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1 index 2e02d86198f..8561a839eb6 100644 --- a/usr.bin/join/join.1 +++ b/usr.bin/join/join.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: join.1,v 1.17 2006/12/28 11:27:41 jmc Exp $ +.\" $OpenBSD: join.1,v 1.18 2007/05/29 18:29:26 jmc Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -46,7 +46,6 @@ .Fl a Ar file_number | Fl v Ar file_number .Oc .Op Fl e Ar string -.Op Fl j Ar file_number field .Op Fl o Ar list .Op Fl t Ar char .Ar file1 diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c index 618bd7c391d..9c10b733007 100644 --- a/usr.bin/join/join.c +++ b/usr.bin/join/join.c @@ -1,4 +1,4 @@ -/* $OpenBSD: join.c,v 1.19 2007/04/23 19:21:24 millert Exp $ */ +/* $OpenBSD: join.c,v 1.20 2007/05/29 18:29:26 jmc Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -41,7 +41,7 @@ static const char copyright[] = #ifndef lint /*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */ -static const char rcsid[] = "$OpenBSD: join.c,v 1.19 2007/04/23 19:21:24 millert Exp $"; +static const char rcsid[] = "$OpenBSD: join.c,v 1.20 2007/05/29 18:29:26 jmc Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -649,7 +649,7 @@ usage(void) len = strlen(__progname) + sizeof("usage: "); (void)fprintf(stderr, "usage: %s [-1 field] [-2 field] " "[-a file_number | -v file_number] [-e string]\n" - "%*s[-j file_number field] [-o list] [-t char] file1 file2\n", + "%*s[-o list] [-t char] file1 file2\n", __progname, len, ""); exit(1); } |