diff options
| author | Igor Sobrado <sobrado@cvs.openbsd.org> | 2007-08-06 19:16:08 +0000 |
|---|---|---|
| committer | Igor Sobrado <sobrado@cvs.openbsd.org> | 2007-08-06 19:16:08 +0000 |
| commit | d569c9b0c585d1ada0bb33679611b77eba528140 (patch) | |
| tree | af2426db3e795320f587d155021169a3f1700b3e | |
| parent | 602a7968e47e34fd38658741b7b66d3c9115f9cf (diff) | |
the ellipsis is not an optional argument; while here, sync the usage
and synopsis of commands
lots of good ideas by jmc@
ok jmc@
56 files changed, 192 insertions, 197 deletions
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1 index 4fb9daa3a2f..cd4fe72e931 100644 --- a/bin/kill/kill.1 +++ b/bin/kill/kill.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: kill.1,v 1.29 2007/05/31 19:19:14 jmc Exp $ +.\" $OpenBSD: kill.1,v 1.30 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)kill.1 8.2 (Berkeley) 4/28/95 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt KILL 1 .Os .Sh NAME @@ -42,19 +42,16 @@ .Sh SYNOPSIS .Nm kill .Op Fl s Ar signal_name -.Ar pid -.Op Ar ... +.Ar pid ... .Nm kill .Fl l .Op Ar exit_status .Nm kill .Fl Ar signal_name -.Ar pid -.Op Ar ... +.Ar pid ... .Nm kill .Fl Ar signal_number -.Ar pid -.Op Ar ... +.Ar pid ... .Sh DESCRIPTION The .Nm diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1 index 3929afec815..42429a2fe89 100644 --- a/bin/mkdir/mkdir.1 +++ b/bin/mkdir/mkdir.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mkdir.1,v 1.23 2007/05/31 19:19:15 jmc Exp $ +.\" $OpenBSD: mkdir.1,v 1.24 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: mkdir.1,v 1.9 1995/07/25 19:37:13 jtc Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)mkdir.1 8.2 (Berkeley) 1/25/94 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt MKDIR 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nm mkdir .Op Fl p .Op Fl m Ar mode -.Ar directory_name Op Ar ... +.Ar directory ... .Sh DESCRIPTION The .Nm diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 051bf87fd01..df593e71b9c 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkdir.c,v 1.18 2006/03/24 04:17:26 ray Exp $ */ +/* $OpenBSD: mkdir.c,v 1.19 2007/08/06 19:16:05 sobrado Exp $ */ /* $NetBSD: mkdir.c,v 1.14 1995/06/25 21:59:21 mycroft Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)mkdir.c 8.2 (Berkeley) 1/25/94"; #else -static char rcsid[] = "$OpenBSD: mkdir.c,v 1.18 2006/03/24 04:17:26 ray Exp $"; +static char rcsid[] = "$OpenBSD: mkdir.c,v 1.19 2007/08/06 19:16:05 sobrado Exp $"; #endif #endif /* not lint */ @@ -178,6 +178,7 @@ mkpath(char *path, mode_t mode, mode_t dir_mode) void usage(void) { - (void)fprintf(stderr, "usage: %s [-p] [-m mode] dirname ...\n", __progname); + (void)fprintf(stderr, "usage: %s [-p] [-m mode] directory ...\n", + __progname); exit(1); } diff --git a/bin/rmail/rmail.8 b/bin/rmail/rmail.8 index dc0a804a116..8071902502c 100644 --- a/bin/rmail/rmail.8 +++ b/bin/rmail/rmail.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rmail.8,v 1.17 2007/05/31 19:19:15 jmc Exp $ +.\" $OpenBSD: rmail.8,v 1.18 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: rmail.8,v 1.8 1995/03/21 07:08:21 cgd Exp $ .\" .\" Copyright (c) 1983, 1990 The Regents of the University of California. @@ -30,7 +30,7 @@ .\" .\" @(#)rmail.8 6.10 (Berkeley) 4/29/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt RMAIL 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd handle remote mail received via uucp .Sh SYNOPSIS .Nm rmail -.Ar user Op Ar ... +.Ar user ... .Sh DESCRIPTION The .Nm diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1 index 9410d6930d4..f86d2ba5d86 100644 --- a/bin/rmdir/rmdir.1 +++ b/bin/rmdir/rmdir.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rmdir.1,v 1.17 2007/05/31 19:19:15 jmc Exp $ +.\" $OpenBSD: rmdir.1,v 1.18 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: rmdir.1,v 1.10 1995/07/25 19:37:35 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)rmdir.1 8.1 (Berkeley) 5/31/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt RMDIR 1 .Os .Sh NAME @@ -42,7 +42,7 @@ .Sh SYNOPSIS .Nm rmdir .Op Fl p -.Ar directory Op Ar ... +.Ar directory ... .Sh DESCRIPTION The .Nm diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8 index d8ea1033c3a..ea587b93713 100644 --- a/sbin/badsect/badsect.8 +++ b/sbin/badsect/badsect.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: badsect.8,v 1.16 2007/05/31 19:19:43 jmc Exp $ +.\" $OpenBSD: badsect.8,v 1.17 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: badsect.8,v 1.8 1995/03/18 14:54:27 cgd Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)badsect.8 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt BADSECT 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd create files to contain bad sectors .Sh SYNOPSIS .Nm badsect -.Ar bbdir sector Op Ar ... +.Ar bbdir sector ... .Sh DESCRIPTION .Nm makes a file to contain a bad sector. diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c index 6d34d1fe664..f3ecb9bdb32 100644 --- a/sbin/badsect/badsect.c +++ b/sbin/badsect/badsect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: badsect.c,v 1.17 2007/06/29 03:37:09 deraadt Exp $ */ +/* $OpenBSD: badsect.c,v 1.18 2007/08/06 19:16:05 sobrado Exp $ */ /* $NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $ */ /* @@ -40,7 +40,7 @@ static const char copyright[] = #if 0 static char sccsid[] = "@(#)badsect.c 8.1 (Berkeley) 6/5/93"; #else -static const char rcsid[] = "$OpenBSD: badsect.c,v 1.17 2007/06/29 03:37:09 deraadt Exp $"; +static const char rcsid[] = "$OpenBSD: badsect.c,v 1.18 2007/08/06 19:16:05 sobrado Exp $"; #endif #endif /* not lint */ @@ -98,7 +98,7 @@ main(int argc, char *argv[]) int len; if (argc < 3) { - fprintf(stderr, "usage: badsect bbdir blkno [ blkno ]\n"); + fprintf(stderr, "usage: badsect bbdir sector ...\n"); exit(1); } if (chdir(argv[1]) < 0 || stat(".", &stbuf) < 0) diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8 index 786a691a7f9..f32ab54d51e 100644 --- a/sbin/ccdconfig/ccdconfig.8 +++ b/sbin/ccdconfig/ccdconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ccdconfig.8,v 1.22 2007/05/31 19:19:43 jmc Exp $ +.\" $OpenBSD: ccdconfig.8,v 1.23 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt CCDCONFIG 8 .Os .Sh NAME @@ -47,8 +47,7 @@ .Ar ccd .Ar ileave .Op Ar flags -.Ar dev -.Op Ar ... +.Ar dev ... .Nm ccdconfig .Fl C .Op Fl v @@ -56,8 +55,7 @@ .Nm ccdconfig .Fl u .Op Fl v -.Ar ccd -.Op Ar ... +.Ar ccd ... .Nm ccdconfig .Fl U .Op Fl v diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c index c6fbefaae78..e45ba95c7d9 100644 --- a/sbin/ccdconfig/ccdconfig.c +++ b/sbin/ccdconfig/ccdconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ccdconfig.c,v 1.31 2007/04/17 15:52:24 tedu Exp $ */ +/* $OpenBSD: ccdconfig.c,v 1.32 2007/08/06 19:16:05 sobrado Exp $ */ /* $NetBSD: ccdconfig.c,v 1.6 1996/05/16 07:11:18 thorpej Exp $ */ /*- @@ -720,10 +720,10 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-cv] ccd ileave [flags] %s\n", __progname, - "dev [...]"); + fprintf(stderr, "usage: %s [-cv] ccd ileave [flags] dev ...\n", + __progname); fprintf(stderr, " %s -C [-v] [-f config_file]\n", __progname); - fprintf(stderr, " %s -u [-v] ccd [...]\n", __progname); + fprintf(stderr, " %s -u [-v] ccd ...\n", __progname); fprintf(stderr, " %s -U [-v] [-f config_file]\n", __progname); exit(1); } diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8 index e46bbea5721..f2900b852ad 100644 --- a/sbin/clri/clri.8 +++ b/sbin/clri/clri.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: clri.8,v 1.12 2007/05/31 19:19:43 jmc Exp $ +.\" $OpenBSD: clri.8,v 1.13 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: clri.8,v 1.2 1995/03/18 14:54:31 cgd Exp $ .\" .\" Copyright (c) 1980, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)clri.8 8.2 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt CLRI 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd clear inodes .Sh SYNOPSIS .Nm clri -.Ar special_device inode_number Op Ar ... +.Ar special_device inode_number ... .Sh DESCRIPTION .Bf -symbolic .Nm diff --git a/sbin/ncheck_ffs/ncheck_ffs.8 b/sbin/ncheck_ffs/ncheck_ffs.8 index 1802ef97234..a39862dc9dd 100644 --- a/sbin/ncheck_ffs/ncheck_ffs.8 +++ b/sbin/ncheck_ffs/ncheck_ffs.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ncheck_ffs.8,v 1.21 2007/05/31 19:19:46 jmc Exp $ +.\" $OpenBSD: ncheck_ffs.8,v 1.22 2007/08/06 19:16:05 sobrado Exp $ .\" .\" Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> .\" All rights reserved. @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt NCHECK_FFS 8 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nm ncheck_ffs .Op Fl ams .Op Fl f Ar format -.Op Fl i Ar number Op Ar ... +.Op Fl i Ar number ... .Ar filesystem .Sh DESCRIPTION .Nm @@ -110,7 +110,7 @@ the character following the backslash. The device name is not printed on the first line of output when the .Fl f option is specified. -.It Fl i Ar number Op Ar ... +.It Fl i Ar number ... Report only those files whose inode numbers are as listed. .It Fl m Give more verbose information on inodes. diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c index 04fb1a04582..cfc38226b15 100644 --- a/sbin/ncheck_ffs/ncheck_ffs.c +++ b/sbin/ncheck_ffs/ncheck_ffs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncheck_ffs.c,v 1.32 2007/07/09 17:12:17 thib Exp $ */ +/* $OpenBSD: ncheck_ffs.c,v 1.33 2007/08/06 19:16:05 sobrado Exp $ */ /*- * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com> @@ -55,7 +55,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.32 2007/07/09 17:12:17 thib Exp $"; +static const char rcsid[] = "$OpenBSD: ncheck_ffs.c,v 1.33 2007/08/06 19:16:05 sobrado Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -484,7 +484,8 @@ usage(void) { extern char *__progname; - fprintf(stderr, "usage: %s [-ams] [-f format] [-i number [...]] filesystem\n", + fprintf(stderr, + "usage: %s [-ams] [-f format] [-i number ...] filesystem\n", __progname); exit(3); } diff --git a/usr.bin/apropos/apropos.1 b/usr.bin/apropos/apropos.1 index 29d04558f7f..1b2644fb3b9 100644 --- a/usr.bin/apropos/apropos.1 +++ b/usr.bin/apropos/apropos.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: apropos.1,v 1.11 2007/05/31 19:20:07 jmc Exp $ +.\" $OpenBSD: apropos.1,v 1.12 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: apropos.1,v 1.4 1995/09/04 20:46:17 tls Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)apropos.1 8.1 (Berkeley) 6/29/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt APROPOS 1 .Os .Sh NAME @@ -41,8 +41,7 @@ .Op Fl C Ar file .Op Fl M Ar path .Op Fl m Ar path -.Ar keyword -.Op Ar ... +.Ar keyword ... .Sh DESCRIPTION .Nm shows which manual pages contain instances of any of the given diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c index 86b8903adbe..dedaa01f072 100644 --- a/usr.bin/apropos/apropos.c +++ b/usr.bin/apropos/apropos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apropos.c,v 1.12 2006/04/02 21:38:56 djm Exp $ */ +/* $OpenBSD: apropos.c,v 1.13 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95"; #else -static char rcsid[] = "$OpenBSD: apropos.c,v 1.12 2006/04/02 21:38:56 djm Exp $"; +static char rcsid[] = "$OpenBSD: apropos.c,v 1.13 2007/08/06 19:16:06 sobrado Exp $"; #endif #endif /* not lint */ @@ -217,6 +217,6 @@ usage(void) { (void)fprintf(stderr, - "usage: apropos [-C file] [-M path] [-m path] keyword [...]\n"); + "usage: apropos [-C file] [-M path] [-m path] keyword ...\n"); exit(1); } diff --git a/usr.bin/audioctl/audioctl.1 b/usr.bin/audioctl/audioctl.1 index e9649b0103b..e96590f7f6b 100644 --- a/usr.bin/audioctl/audioctl.1 +++ b/usr.bin/audioctl/audioctl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: audioctl.1,v 1.20 2007/05/31 19:20:07 jmc Exp $ +.\" $OpenBSD: audioctl.1,v 1.21 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: audioctl.1,v 1.7 1998/04/27 16:55:23 augustss Exp $ .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt AUDIOCTL 1 .Os .Sh NAME @@ -47,13 +47,11 @@ .Nm audioctl .Op Fl f Ar file .Op Fl n -.Ar name -.Op Ar ... +.Ar name ... .Nm audioctl .Op Fl f Ar file .Op Fl n -.Ar name Ns = Ns Ar value -.Op Ar ... +.Ar name Ns = Ns Ar value ... .Sh DESCRIPTION The .Nm diff --git a/usr.bin/audioctl/audioctl.c b/usr.bin/audioctl/audioctl.c index bbd4e99f18d..10faad0ad4a 100644 --- a/usr.bin/audioctl/audioctl.c +++ b/usr.bin/audioctl/audioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: audioctl.c,v 1.12 2006/03/14 19:36:44 moritz Exp $ */ +/* $OpenBSD: audioctl.c,v 1.13 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: audioctl.c,v 1.14 1998/04/27 16:55:23 augustss Exp $ */ /* @@ -323,8 +323,8 @@ usage(void) fprintf(stderr, "usage: %s [-f file] [-n] -a\n" - " %s [-f file] [-n] name [...]\n" - " %s [-f file] [-n] name=value [...]\n", __progname, + " %s [-f file] [-n] name ...\n" + " %s [-f file] [-n] name=value ...\n", __progname, __progname, __progname); exit(1); diff --git a/usr.bin/banner/banner.1 b/usr.bin/banner/banner.1 index 6ad7302686f..59fc82dbaf7 100644 --- a/usr.bin/banner/banner.1 +++ b/usr.bin/banner/banner.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: banner.1,v 1.7 2007/05/31 19:20:07 jmc Exp $ +.\" $OpenBSD: banner.1,v 1.8 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: banner.1,v 1.1.1.1 1995/04/09 05:53:04 cgd Exp $ .\" .\" @(#)Copyright (c) 1995, Simon J. Gerraty. @@ -16,7 +16,7 @@ .\" Please send copies of changes and bug-fixes to: .\" sjg@zen.void.oz.au .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt BANNER 1 .Os .Sh NAME @@ -24,8 +24,7 @@ .Nd print strings in large letters .Sh SYNOPSIS .Nm banner -.Ar string -.Op Ar ... +.Ar string ... .Sh DESCRIPTION .Nm prints up to 10 characters of each diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 index ed36f248265..2660d4abe30 100644 --- a/usr.bin/cvs/cvs.1 +++ b/usr.bin/cvs/cvs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.113 2007/05/31 19:20:09 jmc Exp $ +.\" $OpenBSD: cvs.1,v 1.114 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2004-2007 Xavier Santolaria <xsa@openbsd.org> @@ -24,7 +24,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt CVS 1 .Os .Sh NAME @@ -42,7 +42,7 @@ .Xc .Op Fl T Ar tmpdir .Op Fl z Ar level -.Ar command Op Ar ... +.Ar command ... .Ek .Sh DESCRIPTION The diff --git a/usr.bin/cvs/cvs.c b/usr.bin/cvs/cvs.c index 07189832b90..c80962dff28 100644 --- a/usr.bin/cvs/cvs.c +++ b/usr.bin/cvs/cvs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cvs.c,v 1.128 2007/05/27 21:14:06 ray Exp $ */ +/* $OpenBSD: cvs.c,v 1.129 2007/08/06 19:16:06 sobrado Exp $ */ /* * Copyright (c) 2006, 2007 Joris Vink <joris@openbsd.org> * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> @@ -119,7 +119,7 @@ usage(void) { (void)fprintf(stderr, "usage: %s [-flnQqRrtVvw] [-d root] [-e editor] [-s var=val]\n" - " [-T tmpdir] [-z level] command [...]\n", __progname); + " [-T tmpdir] [-z level] command ...\n", __progname); exit(1); } diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1 index 94da4fa0bbd..3ba185c0801 100644 --- a/usr.bin/lorder/lorder.1 +++ b/usr.bin/lorder/lorder.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: lorder.1,v 1.8 2007/05/31 19:20:12 jmc Exp $ +.\" $OpenBSD: lorder.1,v 1.9 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: lorder.1,v 1.5 1995/08/31 22:42:44 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)lorder.1 8.2 (Berkeley) 4/28/95 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt LORDER 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd list dependencies for object files .Sh SYNOPSIS .Nm lorder -.Ar file Op Ar ... +.Ar .Sh DESCRIPTION The .Nm diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1 index 1abcb468573..eb10d7f7f91 100644 --- a/usr.bin/mail/mail.1 +++ b/usr.bin/mail/mail.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mail.1,v 1.50 2007/05/31 19:20:12 jmc Exp $ +.\" $OpenBSD: mail.1,v 1.51 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)mail.1 8.8 (Berkeley) 4/28/95 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt MAIL 1 .Os .Sh NAME @@ -44,8 +44,8 @@ .Op Fl b Ar list .Op Fl c Ar list .Op Fl s Ar subject -.Ar to-addr Op Ar ... -.Op Fl Ar sendmail-options Op Ar ... +.Ar to-addr ... +.Op Fl Ar sendmail-options ... .Ek .Nm mail .Op Fl IiNnv diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c index d3a41a9ac7e..841d439cac6 100644 --- a/usr.bin/mail/main.c +++ b/usr.bin/mail/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.19 2004/04/19 10:17:18 jmc Exp $ */ +/* $OpenBSD: main.c,v 1.20 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: main.c,v 1.7 1997/05/13 06:15:57 mikel Exp $ */ /* @@ -40,7 +40,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95"; #else -static const char rcsid[] = "$OpenBSD: main.c,v 1.19 2004/04/19 10:17:18 jmc Exp $"; +static const char rcsid[] = "$OpenBSD: main.c,v 1.20 2007/08/06 19:16:06 sobrado Exp $"; #endif #endif /* not lint */ @@ -291,8 +291,8 @@ usage(void) { fprintf(stderr, "usage: %s [-Iinv] [-b list] [-c list] " - "[-s subject] to-addr [...]\n", __progname); - fprintf(stderr, " %*s [-sendmail-options [...]]\n", + "[-s subject] to-addr ...\n", __progname); + fprintf(stderr, " %*s [-sendmail-options ...]\n", (int)strlen(__progname), ""); fprintf(stderr, " %s [-IiNnv] -f [name]\n", __progname); fprintf(stderr, " %s [-IiNnv] [-u user]\n", __progname); diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1 index 1ed6a6b3c1f..b2596843ce3 100644 --- a/usr.bin/man/man.1 +++ b/usr.bin/man/man.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: man.1,v 1.36 2007/06/01 06:27:57 jmc Exp $ +.\" $OpenBSD: man.1,v 1.37 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd $Mdocdate: June 1 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt MAN 1 .Os .Sh NAME @@ -44,7 +44,7 @@ .Op Fl S Ar subsection .Op Fl s Ar section .Op Ar section -.Ar name Op Ar ... +.Ar name ... .Nm man .Fl f Ar command .Nm man diff --git a/usr.bin/man/man.c b/usr.bin/man/man.c index aec437835e4..0aedd5790e0 100644 --- a/usr.bin/man/man.c +++ b/usr.bin/man/man.c @@ -1,4 +1,4 @@ -/* $OpenBSD: man.c,v 1.34 2007/06/04 20:40:10 otto Exp $ */ +/* $OpenBSD: man.c,v 1.35 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95"; #else -static char rcsid[] = "$OpenBSD: man.c,v 1.34 2007/06/04 20:40:10 otto Exp $"; +static char rcsid[] = "$OpenBSD: man.c,v 1.35 2007/08/06 19:16:06 sobrado Exp $"; #endif #endif /* not lint */ @@ -790,7 +790,7 @@ static void usage(void) { (void)fprintf(stderr, "usage: %s [-achw] [-C file] [-M path] [-m path] " - "[-S subsection] [-s section]\n\t [section] name [...]\n", + "[-S subsection] [-s section]\n\t [section] name ...\n", __progname); (void)fprintf(stderr, " %s -f command\n", __progname); (void)fprintf(stderr, " %s -k keyword\n", __progname); diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1 index 04d1d411c8d..4a5e0cc1e8b 100644 --- a/usr.bin/mixerctl/mixerctl.1 +++ b/usr.bin/mixerctl/mixerctl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mixerctl.1,v 1.27 2007/05/31 19:20:13 jmc Exp $ +.\" $OpenBSD: mixerctl.1,v 1.28 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt MIXERCTL 1 .Os .Sh NAME @@ -48,17 +48,16 @@ .Nm mixerctl .Op Fl nv .Op Fl f Ar file -.Ar name Op Ar ... +.Ar name ... .Nm mixerctl .Op Fl qt .Op Fl f Ar file -.Ar name Op Ar ... +.Ar name ... .Nm mixerctl .Op Fl q .Pf \ \& Op Fl f Ar file .Xo -.Ar name Ns = Ns Ar value -.Op Ar ... +.Ar name Ns = Ns Ar value ... .Xc .Sh DESCRIPTION The diff --git a/usr.bin/mixerctl/mixerctl.c b/usr.bin/mixerctl/mixerctl.c index f1ce67590cb..cdf7b762d7b 100644 --- a/usr.bin/mixerctl/mixerctl.c +++ b/usr.bin/mixerctl/mixerctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mixerctl.c,v 1.23 2005/10/07 17:08:36 deraadt Exp $ */ +/* $OpenBSD: mixerctl.c,v 1.24 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $ */ /* @@ -401,9 +401,9 @@ usage(void) fprintf(stderr, "usage: %s [-nv] [-f file] -a\n" - " %s [-nv] [-f file] name [...]\n" - " %s [-qt] [-f file] name [...]\n" - " %s [-q] [-f file] name=value [...]\n", + " %s [-nv] [-f file] name ...\n" + " %s [-qt] [-f file] name ...\n" + " %s [-q] [-f file] name=value ...\n", __progname, __progname, __progname, __progname); exit(1); diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1 index f25489924ef..569cb15d872 100644 --- a/usr.bin/mkdep/mkdep.1 +++ b/usr.bin/mkdep/mkdep.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mkdep.1,v 1.7 2007/05/31 19:20:13 jmc Exp $ +.\" $OpenBSD: mkdep.1,v 1.8 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: mkdep.1,v 1.3 1994/12/23 07:34:56 jtc Exp $ .\" .\" Copyright (c) 1987, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)mkdep.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt MKDEP 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Op Fl ap .Op Fl f Ar file .Op Ar flags -.Ar file Op Ar ... +.Ar .Sh DESCRIPTION .Nm takes a set of flags for the C compiler and a list diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh index dcbdbd56520..d340bf87999 100644 --- a/usr.bin/mkdep/mkdep.gcc.sh +++ b/usr.bin/mkdep/mkdep.gcc.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: mkdep.gcc.sh,v 1.13 2003/07/16 09:38:01 otto Exp $ +# $OpenBSD: mkdep.gcc.sh,v 1.14 2007/08/06 19:16:06 sobrado Exp $ # $NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $ # # Copyright (c) 1991, 1993 @@ -78,7 +78,7 @@ while : done if [ $# = 0 ] ; then - echo 'usage: mkdep [-p] [-f depend_file] [cc_flags] file ...' + echo 'usage: mkdep [-ap] [-f file] [flags] file ...' exit 1 fi diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1 index dd828a12704..8d1d467c1e8 100644 --- a/usr.bin/mkstr/mkstr.1 +++ b/usr.bin/mkstr/mkstr.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mkstr.1,v 1.10 2007/05/31 19:20:13 jmc Exp $ +.\" $OpenBSD: mkstr.1,v 1.11 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: mkstr.1,v 1.3 1995/09/28 06:22:19 tls Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)mkstr.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt MKSTR 1 .Os .Sh NAME @@ -40,7 +40,8 @@ .Nm mkstr .Op Fl .Ar messagefile -.Ar prefix file Op Ar ... +.Ar prefix +.Ar .Sh DESCRIPTION .Nm mkstr creates files containing error messages extracted from C source, diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c index 71185eeb36c..10d02184144 100644 --- a/usr.bin/mkstr/mkstr.c +++ b/usr.bin/mkstr/mkstr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkstr.c,v 1.8 2003/06/03 02:56:13 millert Exp $ */ +/* $OpenBSD: mkstr.c,v 1.9 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $ */ /* @@ -40,7 +40,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93"; #else -static const char rcsid[] = "$OpenBSD: mkstr.c,v 1.8 2003/06/03 02:56:13 millert Exp $"; +static const char rcsid[] = "$OpenBSD: mkstr.c,v 1.9 2007/08/06 19:16:06 sobrado Exp $"; #endif #endif /* not lint */ @@ -327,6 +327,7 @@ usage(void) { extern char *__progname; - fprintf(stderr, "usage: %s [-] mesgfile prefix file ...\n", __progname); + fprintf(stderr, "usage: %s [-] messagefile prefix file ...\n", + __progname); exit(1); } diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1 index 89c27c43394..1466c17b7b2 100644 --- a/usr.bin/nm/nm.1 +++ b/usr.bin/nm/nm.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nm.1,v 1.19 2007/05/31 19:20:14 jmc Exp $ +.\" $OpenBSD: nm.1,v 1.20 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: nm.1,v 1.3 1995/08/31 23:41:58 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)nm.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt NM 1 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm nm .Op Fl aCegnoprsuVw -.Op Ar file ... +.Op Ar .Sh DESCRIPTION The symbol table (name list) of each object in .Ar file(s) diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c index a6416656072..daf2cfb3715 100644 --- a/usr.bin/nm/nm.c +++ b/usr.bin/nm/nm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nm.c,v 1.29 2005/01/03 14:49:39 espie Exp $ */ +/* $OpenBSD: nm.c,v 1.30 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */ /* @@ -42,7 +42,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93"; #endif -static const char rcsid[] = "$OpenBSD: nm.c,v 1.29 2005/01/03 14:49:39 espie Exp $"; +static const char rcsid[] = "$OpenBSD: nm.c,v 1.30 2007/08/06 19:16:06 sobrado Exp $"; #include <sys/param.h> #include <sys/mman.h> @@ -1081,7 +1081,7 @@ usage(void) if (issize) fprintf(stderr, "usage: %s [-tw] [file ...]\n", __progname); else - fprintf(stderr, "usage: %s [-aABCegnoprsuvVw] [file ...]\n", + fprintf(stderr, "usage: %s [-aCegnoprsuVw] [file ...]\n", __progname); exit(1); } diff --git a/usr.bin/nm/size.1 b/usr.bin/nm/size.1 index d5eb0944df0..67530ad58d8 100644 --- a/usr.bin/nm/size.1 +++ b/usr.bin/nm/size.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: size.1,v 1.4 2007/05/31 19:20:14 jmc Exp $ +.\" $OpenBSD: size.1,v 1.5 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: size.1,v 1.6 1996/01/14 23:07:11 pk Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)size.1 8.2 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt SIZE 1 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm size .Op Fl tw -.Op Ar file Ar ... +.Op Ar .Sh DESCRIPTION .Nm displays the text, data and bss segment sizes of the specified diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1 index 1c8cd3261ed..5bc3bcf20d9 100644 --- a/usr.bin/paste/paste.1 +++ b/usr.bin/paste/paste.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: paste.1,v 1.10 2007/05/31 19:20:14 jmc Exp $ +.\" $OpenBSD: paste.1,v 1.11 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 1989, 1990 The Regents of the University of California. .\" All rights reserved. @@ -33,7 +33,7 @@ .\" .\" from: @(#)paste.1 5.6 (Berkeley) 7/27/91 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt PASTE 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nm paste .Op Fl s .Op Fl d Ar list -.Ar file Op Ar ... +.Ar .Sh DESCRIPTION The .Nm paste diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index 6d2dbb3d991..bd8ba2fd84f 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -1,4 +1,4 @@ -/* $OpenBSD: paste.c,v 1.15 2006/05/04 05:55:33 ray Exp $ */ +/* $OpenBSD: paste.c,v 1.16 2007/08/06 19:16:06 sobrado Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -40,7 +40,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/ -static char rcsid[] = "$OpenBSD: paste.c,v 1.15 2006/05/04 05:55:33 ray Exp $"; +static char rcsid[] = "$OpenBSD: paste.c,v 1.16 2007/08/06 19:16:06 sobrado Exp $"; #endif /* not lint */ #include <sys/queue.h> @@ -255,7 +255,7 @@ void usage(void) { extern char *__progname; - (void)fprintf(stderr, "usage: %s [-s] [-d delimiters] file ...\n", - __progname); + (void)fprintf(stderr, "usage: %s [-s] [-d list] file ...\n", + __progname); exit(1); } diff --git a/usr.bin/pmdb/pmdb.1 b/usr.bin/pmdb/pmdb.1 index 442bacd31b0..075cb8b2cd5 100644 --- a/usr.bin/pmdb/pmdb.1 +++ b/usr.bin/pmdb/pmdb.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pmdb.1,v 1.16 2007/05/31 19:20:14 jmc Exp $ +.\" $OpenBSD: pmdb.1,v 1.17 2007/08/06 19:16:05 sobrado Exp $ .\" .\" Copyright (c) 2002 Artur Grabowski <art@openbsd.org> .\" All rights reserved. @@ -23,7 +23,7 @@ .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt PMDB 1 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nm pmdb .Op Fl c Ar core .Op Fl p Ar pid -.Ar program Op Ar ... +.Ar program ... .Sh DESCRIPTION The .Nm diff --git a/usr.bin/pmdb/pmdb.c b/usr.bin/pmdb/pmdb.c index f70ca1eef22..70f032d452c 100644 --- a/usr.bin/pmdb/pmdb.c +++ b/usr.bin/pmdb/pmdb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmdb.c,v 1.20 2006/12/20 06:45:10 steven Exp $ */ +/* $OpenBSD: pmdb.c,v 1.21 2007/08/06 19:16:05 sobrado Exp $ */ /* * Copyright (c) 2002 Artur Grabowski <art@openbsd.org> * All rights reserved. @@ -84,7 +84,7 @@ usage(void) { extern char *__progname; - fprintf(stderr, "Usage: %s [-c core] [-p pid] <program> args\n", + fprintf(stderr, "usage: %s [-c core] [-p pid] program ...\n", __progname); exit(1); } diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1 index d5005ad4e4a..95e57e8a3c6 100644 --- a/usr.bin/ranlib/ranlib.1 +++ b/usr.bin/ranlib/ranlib.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ranlib.1,v 1.10 2007/05/31 19:20:14 jmc Exp $ +.\" $OpenBSD: ranlib.1,v 1.11 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 1990 Regents of the University of California. .\" All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)ranlib.1 6.7 (Berkeley) 5/9/91 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt RANLIB 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh SYNOPSIS .Nm ranlib .Op Fl t -.Ar file Op Ar ... +.Ar .Sh DESCRIPTION .Nm ranlib creates a table of external references for archive libraries, diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c index 3a908e5f51f..9ee20b64d15 100644 --- a/usr.bin/ranlib/ranlib.c +++ b/usr.bin/ranlib/ranlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ranlib.c,v 1.6 2003/06/12 20:58:10 deraadt Exp $ */ +/* $OpenBSD: ranlib.c,v 1.7 2007/08/06 19:16:06 sobrado Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -40,7 +40,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)ranlib.c 5.6 (Berkeley) 2/26/91";*/ -static char rcsid[] = "$OpenBSD: ranlib.c,v 1.6 2003/06/12 20:58:10 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: ranlib.c,v 1.7 2007/08/06 19:16:06 sobrado Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -86,6 +86,6 @@ main(int argc, char *argv[]) static void usage(void) { - (void)fprintf(stderr, "usage: ranlib [-t] archive ...\n"); + (void)fprintf(stderr, "usage: ranlib [-t] file ...\n"); exit(1); } diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1 index 9404b6f66c1..26f52533a3a 100644 --- a/usr.bin/shar/shar.1 +++ b/usr.bin/shar/shar.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: shar.1,v 1.9 2007/05/31 19:20:16 jmc Exp $ +.\" $OpenBSD: shar.1,v 1.10 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -30,14 +30,15 @@ .\" .\" @(#)shar.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt SHAR 1 .Os .Sh NAME .Nm shar .Nd create a shell archive of files .Sh SYNOPSIS -.Nm shar Ar file Op Ar ... +.Nm shar +.Ar .Sh DESCRIPTION .Nm shar writes an diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1 index 17140e37aa4..9b221762be0 100644 --- a/usr.bin/ssh/scp.1 +++ b/usr.bin/ssh/scp.1 @@ -9,9 +9,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.41 2007/05/31 19:20:16 jmc Exp $ +.\" $OpenBSD: scp.1,v 1.42 2007/08/06 19:16:06 sobrado Exp $ .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt SCP 1 .Os .Sh NAME @@ -34,7 +34,7 @@ .Ar host1 No : .Oc Ns Ar file1 .Sm on -.Op Ar ... +.Ar ... .Sm off .Oo .Op Ar user No @ diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index e250272d879..61a45ef5626 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.159 2007/06/13 00:21:27 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.160 2007/08/06 19:16:06 sobrado Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -1097,7 +1097,7 @@ usage(void) (void) fprintf(stderr, "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n" " [-l limit] [-o ssh_option] [-P port] [-S program]\n" - " [[user@]host1:]file1 [...] [[user@]host2:]file2\n"); + " [[user@]host1:]file1 ... [[user@]host2:]file2\n"); exit(1); } diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1 index 461cf7a0991..eb8100bbdd2 100644 --- a/usr.bin/strip/strip.1 +++ b/usr.bin/strip/strip.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: strip.1,v 1.7 2007/05/31 19:20:17 jmc Exp $ +.\" $OpenBSD: strip.1,v 1.8 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 1989, 1990 The Regents of the University of California. .\" All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)strip.1 6.6 (Berkeley) 5/26/91 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt STRIP 1 .Os .Sh NAME @@ -37,9 +37,8 @@ .Nd remove unnecessary information from executable files .Sh SYNOPSIS .Nm strip -.Op Fl d -.Op Fl x -.Ar file Op Ar ... +.Op Fl dx +.Ar .Sh DESCRIPTION The .Nm diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1 index fda5524ec43..ed428f7139b 100644 --- a/usr.bin/telnet/telnet.1 +++ b/usr.bin/telnet/telnet.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: telnet.1,v 1.39 2007/05/31 19:20:17 jmc Exp $ +.\" $OpenBSD: telnet.1,v 1.40 2007/08/06 19:16:05 sobrado Exp $ .\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" from: @(#)telnet.1 8.4 (Berkeley) 2/3/94 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt TELNET 1 .Os .Sh NAME @@ -321,7 +321,7 @@ and .Ic display commands). .Bl -tag -width "mode type" -.It Ic auth Ar argument Op Ar ... +.It Ic auth Ar argument ... The .Ic auth command manipulates the information sent through the @@ -353,13 +353,13 @@ authentication. Close a .Tn TELNET session and return to command mode. -.It Ic display Ar argument Op Ar ... +.It Ic display Ar argument ... Displays all, or some, of the .Ic set and .Ic toggle values (see below). -.It Ic encrypt Ar argument Op Ar ... +.It Ic encrypt Ar argument ... The .Ic encrypt command manipulates the information sent through the @@ -437,7 +437,7 @@ or .Ic encrypt stop commands. .El -.It Ic environ Ar arguments Op Ar ... +.It Ic environ Ar argument ... The .Ic environ command is used to manipulate the @@ -630,7 +630,7 @@ Close any open session and exit .Nm telnet . An end-of-file (in command mode) will also close a session and exit. -.It Ic send Ar arguments +.It Ic send Ar argument ... Sends one or more special character sequences to the remote host. The following are the arguments which may be specified (more than one argument may be specified at a time): @@ -1188,7 +1188,7 @@ Show the current status of .Nm telnet . This includes the peer one is connected to, as well as the current mode. -.It Ic toggle Ar arguments Op Ar ... +.It Ic toggle Ar argument ... Toggle (between .Dv TRUE and diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1 index 5155ec29f07..eea8fad1a37 100644 --- a/usr.bin/tftp/tftp.1 +++ b/usr.bin/tftp/tftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tftp.1,v 1.16 2007/05/31 19:20:17 jmc Exp $ +.\" $OpenBSD: tftp.1,v 1.17 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)tftp.1 8.2 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt TFTP 1 .Os .Sh NAME @@ -62,7 +62,7 @@ is running, it issues the prompt and recognizes the following commands: .Pp .Bl -tag -width verbose -compact -.It Ic \&? Ar command-name Op Ar ... +.It Ic \&? Ar command-name ... Print help information. .Pp .It Ic ascii @@ -109,8 +109,7 @@ commands. .Ic get Oo Ar host1 : Oc Ns .Ar file1 .Oo Ar host2 : Oc Ns -.Ar file2 -.Ar ... +.Ar file2 ... .Oo Ar hostN : Oc Ns .Ar fileN .Xc diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1 index 4cce451ad33..6ec2c135692 100644 --- a/usr.bin/touch/touch.1 +++ b/usr.bin/touch/touch.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: touch.1,v 1.13 2007/05/31 19:20:18 jmc Exp $ +.\" $OpenBSD: touch.1,v 1.14 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $ .\" .\" Copyright (c) 1991, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)touch.1 8.3 (Berkeley) 4/28/95 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt TOUCH 1 .Os .Sh NAME @@ -44,7 +44,7 @@ .Op Fl acm .Op Fl r Ar file .Op Fl t Ar [[CC]YY]MMDDhhmm[.SS] -.Ar file Op Ar ... +.Ar .Sh DESCRIPTION The .Nm diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index f8f9ccf4c94..45d6ab23d26 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: touch.c,v 1.16 2007/06/18 11:20:58 millert Exp $ */ +/* $OpenBSD: touch.c,v 1.17 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */ /* @@ -296,6 +296,7 @@ usage(void) extern char *__progname; (void)fprintf(stderr, - "usage: %s [-acm] [-r file] [-t time] file ...\n", __progname); + "usage: %s [-acm] [-r file] [-t [[CC]YY]MMDDhhmm[.SS]] file ...\n", + __progname); exit(1); } diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1 index dd9c7da6dc9..4c228d8fcc0 100644 --- a/usr.bin/what/what.1 +++ b/usr.bin/what/what.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: what.1,v 1.13 2007/05/31 19:20:20 jmc Exp $ +.\" $OpenBSD: what.1,v 1.14 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)what.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt WHAT 1 .Os .Sh NAME @@ -39,7 +39,7 @@ .Sh SYNOPSIS .Nm what .Op Fl s -.Ar file Op Ar ... +.Ar .Sh DESCRIPTION .Nm reads each diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1 index 844812f9548..9af852900d1 100644 --- a/usr.bin/whatis/whatis.1 +++ b/usr.bin/whatis/whatis.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: whatis.1,v 1.13 2007/05/31 19:20:20 jmc Exp $ +.\" $OpenBSD: whatis.1,v 1.14 2007/08/06 19:16:06 sobrado Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)whatis.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt WHATIS 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Op Fl C Ar file .Op Fl M Ar path .Op Fl m Ar path -.Ar command Op Ar ... +.Ar command ... .Sh DESCRIPTION .Nm looks up a given command and gives the header line from the manual page. diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1 index 710ed2f7592..3d092619f6a 100644 --- a/usr.bin/whois/whois.1 +++ b/usr.bin/whois/whois.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: whois.1,v 1.25 2007/05/31 19:20:20 jmc Exp $ +.\" $OpenBSD: whois.1,v 1.26 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $ .\" .\" Copyright (c) 1985, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)whois.1 8.2 (Berkeley) 6/20/94 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt WHOIS 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Fl c Ar country-code | Fl h Ar host .Oc .Op Fl p Ar port -.Ar name Op Ar ... +.Ar name ... .Sh DESCRIPTION The .Nm diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index c1552d66baa..5b34bee8d57 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -1,4 +1,4 @@ -/* $OpenBSD: whois.c,v 1.39 2007/07/05 02:12:28 millert Exp $ */ +/* $OpenBSD: whois.c,v 1.40 2007/08/06 19:16:06 sobrado Exp $ */ /* * Copyright (c) 1980, 1993 @@ -308,7 +308,7 @@ usage(void) extern char *__progname; fprintf(stderr, - "usage: %s [-6AadgilmQRr] [-c country-code | -h hostname] " + "usage: %s [-6AadgilmQRr] [-c country-code | -h host] " "[-p port] name ...\n", __progname); exit(1); } diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1 index d632d10e283..c5f53792a14 100644 --- a/usr.bin/xinstall/install.1 +++ b/usr.bin/xinstall/install.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: install.1,v 1.22 2007/05/31 19:20:20 jmc Exp $ +.\" $OpenBSD: install.1,v 1.23 2007/08/06 19:16:06 sobrado Exp $ .\" $NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $ .\" .\" Copyright (c) 1987, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)install.1 8.1 (Berkeley) 6/6/93 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt INSTALL 1 .Os .Sh NAME @@ -44,8 +44,8 @@ .Op Fl g Ar group .Op Fl m Ar mode .Op Fl o Ar owner -.Ar source Op Ar ... -.Ar target Op Ar ... +.Ar source ... +.Ar target ... .Sh DESCRIPTION The .Ar source diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c index d740fae2c86..d073faddcb9 100644 --- a/usr.bin/xinstall/xinstall.c +++ b/usr.bin/xinstall/xinstall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xinstall.c,v 1.45 2007/05/25 20:32:29 krw Exp $ */ +/* $OpenBSD: xinstall.c,v 1.46 2007/08/06 19:16:06 sobrado Exp $ */ /* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93"; #endif -static char rcsid[] = "$OpenBSD: xinstall.c,v 1.45 2007/05/25 20:32:29 krw Exp $"; +static char rcsid[] = "$OpenBSD: xinstall.c,v 1.46 2007/08/06 19:16:06 sobrado Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -601,7 +601,7 @@ void usage(void) { (void)fprintf(stderr, "\ -usage: install [-bCcdpSs] [-B suffix] [-f flags] [-g group] [-m mode] [-o owner]\n source [...] target [...]\n"); +usage: install [-bCcdpSs] [-B suffix] [-f flags] [-g group] [-m mode] [-o owner]\n source ... target ...\n"); exit(EX_USAGE); /* NOTREACHED */ } diff --git a/usr.sbin/bgpctl/bgpctl.c b/usr.sbin/bgpctl/bgpctl.c index 02b5b7efa03..a91e7eaf7cb 100644 --- a/usr.sbin/bgpctl/bgpctl.c +++ b/usr.sbin/bgpctl/bgpctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpctl.c,v 1.125 2007/05/31 04:21:43 claudio Exp $ */ +/* $OpenBSD: bgpctl.c,v 1.126 2007/08/06 19:16:06 sobrado Exp $ */ /* * Copyright (c) 2003 Henning Brauer <henning@openbsd.org> @@ -89,8 +89,8 @@ usage(void) { extern char *__progname; - fprintf(stderr, "usage: %s [-s socket] [-o path] [-n] " - "<command> [arg [...]]\n", __progname); + fprintf(stderr, "usage: %s [-n] [-o directory] [-s socket] " + "command [arguments ...]\n", __progname); exit(1); } diff --git a/usr.sbin/edquota/edquota.8 b/usr.sbin/edquota/edquota.8 index 557f7cda424..c1f69f492a0 100644 --- a/usr.sbin/edquota/edquota.8 +++ b/usr.sbin/edquota/edquota.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: edquota.8,v 1.9 2007/05/31 19:20:23 jmc Exp $ +.\" $OpenBSD: edquota.8,v 1.10 2007/08/06 19:16:07 sobrado Exp $ .\" .\" Copyright (c) 1983, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -31,9 +31,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)edquota.8 8.1 (Berkeley) 6/6/93 -.\" $Id: edquota.8,v 1.9 2007/05/31 19:20:23 jmc Exp $ +.\" $Id: edquota.8,v 1.10 2007/08/06 19:16:07 sobrado Exp $ .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: August 6 2007 $ .Dt EDQUOTA 8 .Os .Sh NAME @@ -43,11 +43,11 @@ .Nm edquota .Op Fl u .Op Fl p Ar proto-username -.Ar username | uid Op Ar ... +.Ar username | uid ... .Nm edquota .Fl g .Op Fl p Ar proto-groupname -.Ar groupname | gid Op Ar ... +.Ar groupname | gid ... .Nm edquota .Fl t .Op Fl u diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index d417ae938d7..be3f981b3f1 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -38,7 +38,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)edquota.c 8.1 (Berkeley) 6/6/93";*/ -static char *rcsid = "$Id: edquota.c,v 1.45 2006/10/18 21:18:59 deraadt Exp $"; +static char *rcsid = "$Id: edquota.c,v 1.46 2007/08/06 19:16:07 sobrado Exp $"; #endif /* not lint */ /* @@ -96,9 +96,10 @@ void usage(void) { (void)fprintf(stderr, "%s%s%s%s", - "Usage: edquota [-u] [-p username] username ...\n", - "\tedquota -g [-p groupname] groupname ...\n", - "\tedquota [-u] -t\n", "\tedquota -g -t\n"); + "usage: edquota [-u] [-p proto-username] username | uid ...\n", + " edquota -g [-p proto-groupname] groupname | gid ...\n", + " edquota -t [-u]\n", + " edquota -g -t\n"); exit(1); } |