yes, we are ready.
Klemens Nanni <[email protected]> wrote:
> I reckon the adoption of `join' was fairly successful and lots of people
> use it exclusively, so upon install I suggest to provide hostname.if(5)
> using it instead of `nwid'.
>
> Likewise, reflect that trend in our driver manuals.
>
> Feedback? Objection? OK?
>
>
> Index: distrib/miniroot/install.sub
> ===================================================================
> RCS file: /cvs/src/distrib/miniroot/install.sub,v
> retrieving revision 1.1182
> diff -u -p -r1.1182 install.sub
> --- distrib/miniroot/install.sub 24 Oct 2021 10:11:24 -0000 1.1182
> +++ distrib/miniroot/install.sub 24 Oct 2021 11:17:29 -0000
> @@ -1241,23 +1241,23 @@ ieee80211_config() {
> ask_until "$_prompt" "O"
> case "$_haswpa-$resp" in
> ?-[Oo]) # No further questions
> - ifconfig $_if nwid "$_nwid"
> - quote nwid "$_nwid" >>$_hn
> + ifconfig $_if join "$_nwid"
> + quote join "$_nwid" >>$_hn
> break
> ;;
> ?-[Ww]) ask_until "WEP key? (will echo)"
> # Make sure ifconfig accepts the key.
> - if _err=$(ifconfig $_if nwid "$_nwid" nwkey
> "$resp" 2>&1) &&
> + if _err=$(ifconfig $_if join "$_nwid" nwkey
> "$resp" 2>&1) &&
> [[ -z $_err ]]; then
> - quote nwid "$_nwid" nwkey "$resp" >>$_hn
> + quote join "$_nwid" nwkey "$resp" >>$_hn
> break
> fi
> echo "$_err"
> ;;
> 1-[Pp]) ask_until "WPA passphrase? (will echo)"
> # Make sure ifconfig accepts the key.
> - if ifconfig $_if nwid "$_nwid" wpakey "$resp";
> then
> - quote nwid "$_nwid" wpakey "$resp"
> >>$_hn
> + if ifconfig $_if join "$_nwid" wpakey "$resp";
> then
> + quote join "$_nwid" wpakey "$resp"
> >>$_hn
> break
> fi
> ;;
> Index: share/man/man4/acx.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/acx.4,v
> retrieving revision 1.49
> diff -u -p -r1.49 acx.4
> --- share/man/man4/acx.4 15 Oct 2021 08:10:44 -0000 1.49
> +++ share/man/man4/acx.4 24 Oct 2021 10:17:23 -0000
> @@ -165,7 +165,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Pp
> @@ -174,7 +174,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/an.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/an.4,v
> retrieving revision 1.45
> diff -u -p -r1.45 an.4
> --- share/man/man4/an.4 15 Oct 2021 08:10:44 -0000 1.45
> +++ share/man/man4/an.4 24 Oct 2021 10:17:23 -0000
> @@ -134,7 +134,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/ath.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/ath.4,v
> retrieving revision 1.68
> diff -u -p -r1.68 ath.4
> --- share/man/man4/ath.4 15 Oct 2021 08:10:44 -0000 1.68
> +++ share/man/man4/ath.4 24 Oct 2021 10:17:23 -0000
> @@ -213,7 +213,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Pp
> @@ -222,7 +222,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/athn.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/athn.4,v
> retrieving revision 1.42
> diff -u -p -r1.42 athn.4
> --- share/man/man4/athn.4 15 Oct 2021 08:10:44 -0000 1.42
> +++ share/man/man4/athn.4 24 Oct 2021 10:17:23 -0000
> @@ -206,7 +206,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Pp
> @@ -215,7 +215,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/atu.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/atu.4,v
> retrieving revision 1.40
> diff -u -p -r1.40 atu.4
> --- share/man/man4/atu.4 15 Oct 2021 08:10:44 -0000 1.40
> +++ share/man/man4/atu.4 24 Oct 2021 10:17:23 -0000
> @@ -178,7 +178,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/atw.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/atw.4,v
> retrieving revision 1.37
> diff -u -p -r1.37 atw.4
> --- share/man/man4/atw.4 15 Oct 2021 08:10:44 -0000 1.37
> +++ share/man/man4/atw.4 24 Oct 2021 10:17:23 -0000
> @@ -150,7 +150,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/bwfm.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/bwfm.4,v
> retrieving revision 1.15
> diff -u -p -r1.15 bwfm.4
> --- share/man/man4/bwfm.4 15 Oct 2021 08:10:44 -0000 1.15
> +++ share/man/man4/bwfm.4 24 Oct 2021 10:17:23 -0000
> @@ -124,7 +124,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Pp
> @@ -133,7 +133,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/bwi.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/bwi.4,v
> retrieving revision 1.45
> diff -u -p -r1.45 bwi.4
> --- share/man/man4/bwi.4 15 Oct 2021 08:10:44 -0000 1.45
> +++ share/man/man4/bwi.4 24 Oct 2021 10:17:23 -0000
> @@ -125,7 +125,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/ipw.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/ipw.4,v
> retrieving revision 1.49
> diff -u -p -r1.49 ipw.4
> --- share/man/man4/ipw.4 15 Oct 2021 08:10:44 -0000 1.49
> +++ share/man/man4/ipw.4 24 Oct 2021 10:17:23 -0000
> @@ -127,7 +127,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/iwi.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/iwi.4,v
> retrieving revision 1.55
> diff -u -p -r1.55 iwi.4
> --- share/man/man4/iwi.4 15 Oct 2021 08:10:44 -0000 1.55
> +++ share/man/man4/iwi.4 24 Oct 2021 10:17:23 -0000
> @@ -127,7 +127,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/iwm.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/iwm.4,v
> retrieving revision 1.40
> diff -u -p -r1.40 iwm.4
> --- share/man/man4/iwm.4 15 Oct 2021 08:10:44 -0000 1.40
> +++ share/man/man4/iwm.4 24 Oct 2021 10:17:23 -0000
> @@ -119,7 +119,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/iwn.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/iwn.4,v
> retrieving revision 1.58
> diff -u -p -r1.58 iwn.4
> --- share/man/man4/iwn.4 15 Oct 2021 08:10:44 -0000 1.58
> +++ share/man/man4/iwn.4 24 Oct 2021 10:17:23 -0000
> @@ -165,7 +165,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/iwx.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/iwx.4,v
> retrieving revision 1.9
> diff -u -p -r1.9 iwx.4
> --- share/man/man4/iwx.4 16 Oct 2021 15:05:59 -0000 1.9
> +++ share/man/man4/iwx.4 24 Oct 2021 10:17:23 -0000
> @@ -110,7 +110,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/malo.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/malo.4,v
> retrieving revision 1.50
> diff -u -p -r1.50 malo.4
> --- share/man/man4/malo.4 15 Oct 2021 08:10:44 -0000 1.50
> +++ share/man/man4/malo.4 24 Oct 2021 10:17:23 -0000
> @@ -136,7 +136,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/otus.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/otus.4,v
> retrieving revision 1.34
> diff -u -p -r1.34 otus.4
> --- share/man/man4/otus.4 15 Oct 2021 08:10:44 -0000 1.34
> +++ share/man/man4/otus.4 24 Oct 2021 10:17:23 -0000
> @@ -129,7 +129,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/pgt.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/pgt.4,v
> retrieving revision 1.45
> diff -u -p -r1.45 pgt.4
> --- share/man/man4/pgt.4 15 Oct 2021 08:10:44 -0000 1.45
> +++ share/man/man4/pgt.4 24 Oct 2021 10:17:23 -0000
> @@ -154,7 +154,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Pp
> @@ -163,7 +163,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/ral.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/ral.4,v
> retrieving revision 1.117
> diff -u -p -r1.117 ral.4
> --- share/man/man4/ral.4 15 Oct 2021 08:10:44 -0000 1.117
> +++ share/man/man4/ral.4 24 Oct 2021 10:17:23 -0000
> @@ -300,7 +300,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Pp
> @@ -309,7 +309,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/rsu.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/rsu.4,v
> retrieving revision 1.24
> diff -u -p -r1.24 rsu.4
> --- share/man/man4/rsu.4 15 Oct 2021 08:10:44 -0000 1.24
> +++ share/man/man4/rsu.4 24 Oct 2021 10:17:23 -0000
> @@ -114,7 +114,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/rtw.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/rtw.4,v
> retrieving revision 1.46
> diff -u -p -r1.46 rtw.4
> --- share/man/man4/rtw.4 15 Oct 2021 08:10:44 -0000 1.46
> +++ share/man/man4/rtw.4 24 Oct 2021 10:17:23 -0000
> @@ -140,7 +140,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Pp
> @@ -149,7 +149,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/rtwn.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/rtwn.4,v
> retrieving revision 1.11
> diff -u -p -r1.11 rtwn.4
> --- share/man/man4/rtwn.4 15 Oct 2021 08:10:44 -0000 1.11
> +++ share/man/man4/rtwn.4 24 Oct 2021 10:17:23 -0000
> @@ -105,7 +105,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/rum.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/rum.4,v
> retrieving revision 1.62
> diff -u -p -r1.62 rum.4
> --- share/man/man4/rum.4 15 Oct 2021 08:10:44 -0000 1.62
> +++ share/man/man4/rum.4 24 Oct 2021 10:17:23 -0000
> @@ -168,7 +168,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Pp
> @@ -177,7 +177,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/run.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/run.4,v
> retrieving revision 1.55
> diff -u -p -r1.55 run.4
> --- share/man/man4/run.4 15 Oct 2021 08:10:45 -0000 1.55
> +++ share/man/man4/run.4 24 Oct 2021 10:17:23 -0000
> @@ -196,7 +196,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/uath.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/uath.4,v
> retrieving revision 1.37
> diff -u -p -r1.37 uath.4
> --- share/man/man4/uath.4 15 Oct 2021 08:10:45 -0000 1.37
> +++ share/man/man4/uath.4 24 Oct 2021 10:17:23 -0000
> @@ -134,7 +134,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/upgt.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/upgt.4,v
> retrieving revision 1.28
> diff -u -p -r1.28 upgt.4
> --- share/man/man4/upgt.4 15 Oct 2021 08:10:45 -0000 1.28
> +++ share/man/man4/upgt.4 24 Oct 2021 10:17:24 -0000
> @@ -159,7 +159,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/ural.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/ural.4,v
> retrieving revision 1.25
> diff -u -p -r1.25 ural.4
> --- share/man/man4/ural.4 15 Oct 2021 08:10:45 -0000 1.25
> +++ share/man/man4/ural.4 24 Oct 2021 10:17:24 -0000
> @@ -146,7 +146,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Pp
> @@ -155,7 +155,7 @@ The following
> example creates a host-based access point on boot:
> .Bd -literal -offset indent
> mediaopt hostap
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet 192.168.1.1 255.255.255.0
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/urtw.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/urtw.4,v
> retrieving revision 1.27
> diff -u -p -r1.27 urtw.4
> --- share/man/man4/urtw.4 15 Oct 2021 08:10:45 -0000 1.27
> +++ share/man/man4/urtw.4 24 Oct 2021 10:17:24 -0000
> @@ -103,7 +103,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh SEE ALSO
> Index: share/man/man4/urtwn.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/urtwn.4,v
> retrieving revision 1.52
> diff -u -p -r1.52 urtwn.4
> --- share/man/man4/urtwn.4 15 Oct 2021 08:10:45 -0000 1.52
> +++ share/man/man4/urtwn.4 24 Oct 2021 10:17:24 -0000
> @@ -156,7 +156,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/wi.4tbl
> ===================================================================
> RCS file: /cvs/src/share/man/man4/wi.4tbl,v
> retrieving revision 1.100
> diff -u -p -r1.100 wi.4tbl
> --- share/man/man4/wi.4tbl 17 Oct 2021 02:03:39 -0000 1.100
> +++ share/man/man4/wi.4tbl 24 Oct 2021 10:17:24 -0000
> @@ -299,7 +299,7 @@ using WEP key
> .Dq mywepkey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> inet autoconf
> .Ed
> .Pp
> @@ -309,7 +309,7 @@ example creates a host-based access poin
> .Bd -literal -offset indent
> inet 192.168.1.1 255.255.255.0
> mediaopt hostap
> -nwid mynwid nwkey mywepkey
> +join mynwid nwkey mywepkey
> .Ed
> .Sh DIAGNOSTICS
> .Bl -diag
> Index: share/man/man4/wpi.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/wpi.4,v
> retrieving revision 1.43
> diff -u -p -r1.43 wpi.4
> --- share/man/man4/wpi.4 15 Oct 2021 08:10:45 -0000 1.43
> +++ share/man/man4/wpi.4 24 Oct 2021 10:17:24 -0000
> @@ -119,7 +119,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
> Index: share/man/man4/zyd.4
> ===================================================================
> RCS file: /cvs/src/share/man/man4/zyd.4,v
> retrieving revision 1.47
> diff -u -p -r1.47 zyd.4
> --- share/man/man4/zyd.4 15 Oct 2021 08:10:45 -0000 1.47
> +++ share/man/man4/zyd.4 24 Oct 2021 10:17:24 -0000
> @@ -165,7 +165,7 @@ using WPA key
> .Dq mywpakey ,
> obtaining an IP address using DHCP:
> .Bd -literal -offset indent
> -nwid mynwid wpakey mywpakey
> +join mynwid wpakey mywpakey
> inet autoconf
> .Ed
> .Sh DIAGNOSTICS
>