On Sun, Apr 11, 2010 at 01:36:35PM -0400, Ted Unangst wrote: > I took a few more editorial liberties here, but on the whole I don't think > we need to spell out "IEEE 802.11-based wireless network interfaces" every > time we're talking about one. >
watch out - i already stomped on the options blurb. some comments inline on the wireless part. > Index: ifconfig.8 > =================================================================== > RCS file: /cvs/src/sbin/ifconfig/ifconfig.8,v > retrieving revision 1.195 > diff -u -r1.195 ifconfig.8 > --- ifconfig.8 11 Apr 2010 17:14:37 -0000 1.195 > +++ ifconfig.8 11 Apr 2010 17:34:17 -0000 > @@ -72,7 +72,7 @@ > .Pp > Only the superuser may modify the configuration of a network interface. > .Pp > -The options are as follows: > +The following options are available: > .Bl -tag -width Ds > .It Fl A > Causes full interface alias information for each interface to > @@ -468,7 +468,9 @@ > .Sh BRIDGE > Bridges have many configuration options as well as a rudimentary > filtering language. > -They are as follows: > +The following options are available for a > +.Xr bridge 4 > +pseudo-device: > .Bl -tag -width Ds > .It Cm add Ar interface > Add > @@ -484,9 +486,6 @@ > Add > .Ar interface > as a span port on the bridge. > -See > -.Xr bridge 4 > -for more details. > .It Cm autoedge Ar interface > Automatically detect the spanning tree edge port status on > .Ar interface . > @@ -848,27 +847,25 @@ > .Op Oo Fl Oc Cm wpapsk Ar psk > .Ek > .Pp > -The options are as follows: > +The following options are available for a wireless device: > .Bl -tag -width Ds > .It Cm bssid Ar bssid > -Set the desired BSSID for IEEE 802.11-based wireless network interfaces. > +Set the desired BSSID. > .It Fl bssid > -Unset the desired BSSID for IEEE 802.11-based wireless network interfaces. > +Unset the desired BSSID. > The interface will automatically select a BSSID in this mode, which is > the default. > .It Cm chan Op Ar n > -Set the channel (radio frequency) to be used for IEEE 802.11-based > -wireless network interfaces to > +Set the channel (radio frequency) to be used to > .Ar n . i think you could just zap "to be used" > .Pp > With no channel specified, > show the list of channels supported by the device. > .It Fl chan > -Unset the desired channel to be used for IEEE 802.11-based wireless > -network interfaces. > +Unset the desired channel to be used. ditto > It doesn't affect the channel to be created for IBSS or Host AP mode. > .It Cm nwflag Ar flag > -Set a specified flag for the wireless network interface. > +Set specified flag. > The flag name can be either > .Ql hidenwid > or > @@ -897,9 +894,9 @@ > and > .Xr hostapd 8 . > .It Fl nwflag Ar flag > -Remove a specified flag for the wireless network interface. > +Remove specified flag. > .It Cm nwid Ar id > -Configure network ID for IEEE 802.11-based wireless network interfaces. > +Configure network ID. > The > .Ar id > can either be any text string up to 32 characters in length, > @@ -911,8 +908,7 @@ > Set the network ID to the empty string to allow the interface to connect > to any available access point. > .It Cm nwkey Ar key > -Enable WEP encryption for IEEE 802.11-based wireless network interfaces > -using the specified > +Enable WEP encryption using the specified > .Ar key . > The > .Ar key > @@ -937,16 +933,14 @@ > The length of each key must be either 40 bits, i.e. a 5-character string or > 10 hexadecimal digits or 104 bits (13-character). > .It Fl nwkey > -Disable WEP encryption for IEEE 802.11-based wireless network interfaces. > +Disable WEP encryption. > .It Cm nwkey Cm persist > -Enable WEP encryption for IEEE 802.11-based wireless network interfaces > -with the persistent key stored in the network card. > +Enable WEP encryption using the persistent key stored in the network card. > .It Cm nwkey Cm persist : Ns Ar key > Write > .Ar key > to the persistent memory of the network card, and > -enable WEP encryption for IEEE 802.11-based wireless network interfaces > -using that > +enable WEP encryption using that > .Ar key . > .It Cm powersave Op Ar duration > Enable 802.11 power saving mode. > @@ -957,7 +951,7 @@ > Show the results of an access point scan. > In Host AP mode, this will dump the list of known nodes without scanning. > .It Cm txpower Ar dBm > -Set the transmit power for IEEE 802.11-based wireless network interfaces. > +Set the transmit power. > The driver will disable any auto level and transmit power controls in this > mode. > .It Fl txpower > @@ -1092,7 +1086,7 @@ > .Op Cm vltime Ar n > .Ek > .Pp > -The options are as follows: > +The following options are available: > .Bl -tag -width Ds > .It Cm anycast > Set the IPv6 anycast address bit. > @@ -1149,7 +1143,7 @@ > .Op Ar number > .Oc > .Pp > -The options are as follows: > +The following options are available: > .Bl -tag -width Ds > .It Fl g Ar group-name > Specify the group. > @@ -1194,7 +1188,9 @@ > .Ar port Oc > .Op Oo Fl Oc Cm flowsrc Ar addr > .Pp > -The options are as follows: > +The following options are available for a > +.Xr pflow 4 > +pseudo-device: > .Bl -tag -width Ds > .It Cm flowdst Ar addr : Ns Ar port > Set the receiver address and the port for > @@ -1286,22 +1282,19 @@ > are described in the > .Sx SPPP > section, below. > -The options are as follows: > +The following options are available for a > +.Xr pppoe 4 > +pseudo-device: > .Bl -tag -width Ds > .It Cm pppoeac Ar access-concentrator > -Set the name of the access-concentrator for the > -.Xr pppoe 4 > -interface. > +Set the name of the access-concentrator. > .It Fl pppoeac > Clear a previously set access-concentrator name. > .It Cm pppoedev Ar parent-interface > Set the name of the interface through which > -.Xr pppoe 4 > packets will be transmitted and received. > .It Cm pppoesvc Ar service > -Set the service name of the > -.Xr pppoe 4 > -interface. > +Set the service name of the interface. > .It Fl pppoesvc > Clear a previously set service name. > .El > @@ -1317,7 +1310,11 @@ > .Op Cm peername Ar name > .Op Cm peerproto Ar proto > .Pp > -The options are as follows: > +The following options are availble for an > +.Xr sppp 4 > +or > +.Xr pppoe 4 > +pseudo-device: > .Bl -tag -width Ds > .It Cm authkey Ar key > Set the client key or password for the PPP authentication protocol. > @@ -1400,7 +1397,7 @@ > .Op Cm tunneldomain Ar route-id > .Ek > .Pp > -The options are as follows: > +The following options are available: > .Bl -tag -width Ds > .It Cm deletetunnel Ar src_address dest_address > Remove the source and destination tunnel addresses. > @@ -1451,7 +1448,7 @@ > with 802.1Q vlan encapsulation. > Packets with 802.1Q encapsulation received > by the parent interface with the correct vlan tag will be diverted to > -the associated vlan pseudo-interface. > +the associated vlan pseudo-device. > The vlan interface is assigned a > copy of the parent interface's flags and the parent's Ethernet address. > If otherwise i'm ok with all the other bits. jmc
