diff options
| -rw-r--r-- | sbin/ifconfig/ifconfig.8 | 17 | ||||
| -rw-r--r-- | sbin/ifconfig/ifconfig.c | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 980ef6b6c54..28f06a2dc26 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ifconfig.8,v 1.105 2005/05/25 07:40:49 reyk Exp $ +.\" $OpenBSD: ifconfig.8,v 1.106 2005/05/31 20:54:38 jmc Exp $ .\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $ .\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $ .\" @@ -47,7 +47,7 @@ .Oc .Op Ar parameters .Nm ifconfig -.Fl aAmM +.Fl AaMm .Op Ar address_family .Nm ifconfig .Fl C @@ -90,7 +90,7 @@ .Nm ifconfig .Ar trunk-interface .Oo -.Cm [-]trunkport +.Oo Fl Oc Ns Cm trunkport .Ar child-iface .Oc .Oo @@ -163,7 +163,8 @@ can be created dynamically at runtime using .Cm ifconfig create . .It Fl M For the chosen 802.11 interfaces, show the results of an access point -scan. In Host AP mode, this will dump the list of known nodes. +scan. +In Host AP mode, this will dump the list of known nodes. .It Fl m Ar interface Print media information for a given .Ar interface . @@ -686,12 +687,9 @@ If the driver is a pseudo-device, set the trunk protocol. Refer to the interface's driver-specific man page for a complete list of the available protocols, -or use -.Bd -literal -offset indent -$ ifconfig -m interface -.Ed +or use the following for a listing of choices: .Pp -for a listing of choices. +.Dl $ ifconfig -m interface .It Cm tunnel Ar src_address dest_address Set the source and destination tunnel addresses on a tunnel interface, including @@ -832,7 +830,6 @@ Create and configure the trunk0 interface for IP address 192.168.23.1, with the em0 and em1 trunk port interfaces: .Pp .Dl # ifconfig trunk0 create 192.168.23.1 trunkport em0 trunkport em1 -.Pp .Sh DIAGNOSTICS Messages indicating the specified interface does not exist, the requested address is unknown, or the user is not privileged and diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 5e014c60f9d..425f0886e54 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ifconfig.c,v 1.142 2005/05/26 03:39:57 henning Exp $ */ +/* $OpenBSD: ifconfig.c,v 1.143 2005/05/31 20:54:38 jmc Exp $ */ /* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */ /* @@ -3599,7 +3599,7 @@ usage(int value) "\t[802.2] [802.2tr] [802.3] [snap] [EtherII]\n" "\t[pppoeac access-concentrator] [-pppoeac]\n" "\t[pppoesvc service] [-pppoesvc]\n" - " ifconfig [-aAmMC] [interface] [address_family]\n" + " ifconfig [-AaCMm] [interface] [address_family]\n" " ifconfig interface create\n" " ifconfig interface destroy\n"); exit(value); |