diff options
| author |   jmc <jmc@openbsd.org> | 2014-05-25 07:36:36 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2014-05-25 07:36:36 +0000 |
| commit | f6157d28d36500a75993b04421f29961c184eb2f (patch) | |
| tree | 8d1a75cee0679c03368da7a032b5dcc299c697de | |
| parent | Nuke last of the illusionary 'dev_bsize' and 'dev_bshift' variables in (diff) | |
| download | wireguard-openbsd-f6157d28d36500a75993b04421f29961c184eb2f.tar.xz wireguard-openbsd-f6157d28d36500a75993b04421f29961c184eb2f.zip | |
don't use plural "arguments" in SYNOPSIS, since "..." makes it
redundant; tweak the rest of the page to stop using both forms,
and tweak usage(), which was wrong anyway, to match this;
| -rw-r--r-- | usr.bin/printf/printf.1 | 14 | ||||
| -rw-r--r-- | usr.bin/printf/printf.c | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1 index b345c1dcd4b..6122b6d17ed 100644 --- a/usr.bin/printf/printf.1 +++ b/usr.bin/printf/printf.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: printf.1,v 1.26 2014/05/13 20:37:48 jmc Exp $ +.\" $OpenBSD: printf.1,v 1.27 2014/05/25 07:36:36 jmc Exp $ .\" .\" Copyright (c) 1989, 1990 The Regents of the University of California. .\" All rights reserved. @@ -32,7 +32,7 @@ .\" .\" from: @(#)printf.1 5.11 (Berkeley) 7/24/91 .\" -.Dd $Mdocdate: May 13 2014 $ +.Dd $Mdocdate: May 25 2014 $ .Dt PRINTF 1 .Os .Sh NAME @@ -41,7 +41,7 @@ .Sh SYNOPSIS .Nm printf .Ar format -.Op Ar arguments ... +.Op Ar argument ... .Sh DESCRIPTION .Nm printf formats and prints its arguments, after the first, under control @@ -55,9 +55,8 @@ are converted and copied to the standard output, and format specifications, each of which causes printing of the next successive .Ar argument . .Pp -The -.Ar arguments -after the first are treated as strings if the corresponding format is +The arguments after the first are treated as strings +if the corresponding format is .Cm b , .Cm c or @@ -72,8 +71,7 @@ If the leading character is a single or double quote, the value is the code of the next character. .El .Pp -The format string is reused as often as necessary to satisfy the -.Ar arguments . +The format string is reused as often as necessary to satisfy the arguments. Any extra format specifications are evaluated with zero or the null string. .Pp diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c index 0765a301c45..289177c3bf8 100644 --- a/usr.bin/printf/printf.c +++ b/usr.bin/printf/printf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printf.c,v 1.21 2014/05/20 01:25:23 guenther Exp $ */ +/* $OpenBSD: printf.c,v 1.22 2014/05/25 07:36:36 jmc Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -497,5 +497,5 @@ check_conversion(const char *s, const char *ep) static void usage(void) { - (void)fprintf(stderr, "usage: printf format [arg ...]\n"); + (void)fprintf(stderr, "usage: printf format [argument ...]\n"); } |