diff options
| author |   jmc <jmc@openbsd.org> | 2006-05-26 09:00:57 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2006-05-26 09:00:57 +0000 |
| commit | d13fc9d9ef85ef3dc4f033d894dc5c9cdf5cd2bf (patch) | |
| tree | 92e13538a3896c66361db8ebb8858763e1525f56 | |
| parent | remove unneeded .Pp; (diff) | |
| download | wireguard-openbsd-d13fc9d9ef85ef3dc4f033d894dc5c9cdf5cd2bf.tar.xz wireguard-openbsd-d13fc9d9ef85ef3dc4f033d894dc5c9cdf5cd2bf.zip | |
simplify synopsis; ok deraadt
| -rw-r--r-- | usr.sbin/arp/arp.8 | 19 | ||||
| -rw-r--r-- | usr.sbin/arp/arp.c | 10 |
2 files changed, 8 insertions, 21 deletions
diff --git a/usr.sbin/arp/arp.8 b/usr.sbin/arp/arp.8 index 04e3f3ba3d0..5b929232f26 100644 --- a/usr.sbin/arp/arp.8 +++ b/usr.sbin/arp/arp.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: arp.8,v 1.16 2006/05/25 15:04:07 jmc Exp $ +.\" $OpenBSD: arp.8,v 1.17 2006/05/26 09:00:57 jmc Exp $ .\" $NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $ .\" .\" Copyright (c) 1985, 1991, 1993 @@ -38,23 +38,14 @@ .Nd address resolution display and control .Sh SYNOPSIS .Nm arp -.Op Fl n +.Op Fl adn .Ar hostname .Nm arp -.Op Fl n -.Fl a -.Nm arp -.Fl d Ar hostname -.Nm arp -.Fl d a -.Nm arp .Op Fl F +.Op Fl f Ar file .Fl s Ar hostname ether_addr .Op Cm temp | permanent .Op Cm pub -.Nm arp -.Op Fl F -.Fl f Ar filename .Sh DESCRIPTION The .Nm @@ -94,9 +85,9 @@ Force existing entries for the given host to be overwritten and .Fl s options). -.It Fl f +.It Fl f Ar file Process entries from -.Ar filename +.Ar file to be set in the .Tn ARP tables. diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 1750540bf07..f6e6bd3d97f 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arp.c,v 1.37 2006/04/18 22:11:49 moritz Exp $ */ +/* $OpenBSD: arp.c,v 1.38 2006/05/26 09:00:57 jmc Exp $ */ /* $NetBSD: arp.c,v 1.12 1995/04/24 13:25:18 cgd Exp $ */ /* @@ -518,13 +518,9 @@ ether_print(const char *scp) void usage(void) { - fprintf(stderr, "usage: arp [-n] hostname\n"); - fprintf(stderr, "usage: arp [-n] -a\n"); - fprintf(stderr, "usage: arp -d hostname\n"); - fprintf(stderr, "usage: arp -d -a\n"); - fprintf(stderr, "usage: arp [-F] -s hostname ether_addr " + fprintf(stderr, "usage: arp [-adn] hostname\n"); + fprintf(stderr, "usage: arp [-F] [-f file] -s hostname ether_addr " "[temp | permanent] [pub]\n"); - fprintf(stderr, "usage: arp [-F] -f filename\n"); exit(1); } |