From d09093c168a1a6df49f1ee8217bfa05a5712a645 Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Sun, 24 Oct 2021 12:32:42 +0000
Subject: [PATCH] Use ifconfig(8)'s "join" command by default

Its adoption went quite well, so install "join" rather than the old "nwid"
in new hostname.if(5) files and follow this trend in our wifi manuals.

OK deraadt sthen
---
 distrib/miniroot/install.sub | 14 +++++++-------
 share/man/man4/an.4          |  6 +++---
 share/man/man4/atu.4         |  6 +++---
 share/man/man4/atw.4         |  6 +++---
 share/man/man4/bwi.4         |  6 +++---
 share/man/man4/ipw.4         |  6 +++---
 share/man/man4/iwi.4         |  6 +++---
 share/man/man4/iwm.4         |  6 +++---
 share/man/man4/iwn.4         |  6 +++---
 share/man/man4/iwx.4         |  6 +++---
 share/man/man4/malo.4        |  6 +++---
 share/man/man4/otus.4        |  6 +++---
 share/man/man4/rsu.4         |  6 +++---
 share/man/man4/rtwn.4        |  6 +++---
 share/man/man4/run.4         |  6 +++---
 share/man/man4/uath.4        |  6 +++---
 share/man/man4/upgt.4        |  6 +++---
 share/man/man4/urtw.4        |  6 +++---
 share/man/man4/urtwn.4       |  6 +++---
 share/man/man4/wpi.4         |  6 +++---
 share/man/man4/zyd.4         |  6 +++---
 21 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index f746d6ce772..16d3b6e3420 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.1182 2021/10/24 10:11:24 kn Exp $
+#	$OpenBSD: install.sub,v 1.1183 2021/10/24 12:32:42 kn Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -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
 				;;
diff --git a/share/man/man4/an.4 b/share/man/man4/an.4
index f243d3ce9a2..46a6b0edea5 100644
--- a/share/man/man4/an.4
+++ b/share/man/man4/an.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: an.4,v 1.45 2021/10/15 08:10:44 kn Exp $
+.\"	$OpenBSD: an.4,v 1.46 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\"	Bill Paul <wpaul@ee.columbia.edu>. All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/an.4,v 1.5 2000/03/02 14:53:45 sheldonh Exp $
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt AN 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/atu.4 b/share/man/man4/atu.4
index cda66ab1548..a81d7d84d4b 100644
--- a/share/man/man4/atu.4
+++ b/share/man/man4/atu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atu.4,v 1.40 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: atu.4,v 1.41 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt ATU 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/atw.4 b/share/man/man4/atw.4
index 6fc17f5dd82..12380137f43 100644
--- a/share/man/man4/atw.4
+++ b/share/man/man4/atw.4
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: atw.4,v 1.37 2021/10/15 08:10:44 kn Exp $
+.\"     $OpenBSD: atw.4,v 1.38 2021/10/24 12:32:42 kn Exp $
 .\"	$NetBSD: atw.4,v 1.8 2004/06/06 04:05:49 wiz Exp $
 .\"
 .\" Copyright (c) 2003
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt ATW 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4
index 7360f051542..0dc933cfae0 100644
--- a/share/man/man4/bwi.4
+++ b/share/man/man4/bwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwi.4,v 1.45 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: bwi.4,v 1.46 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt BWI 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 0d5b42a4307..3653688a789 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipw.4,v 1.49 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: ipw.4,v 1.50 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2004
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt IPW 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 59db2a5910a..4748b85268d 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.55 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: iwi.4,v 1.56 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2004
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt IWI 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4
index b9f26b11e30..376245734fe 100644
--- a/share/man/man4/iwm.4
+++ b/share/man/man4/iwm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwm.4,v 1.40 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: iwm.4,v 1.41 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2007,2008
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt IWM 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index 7bd2d2dd836..2fbc8d97fee 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwn.4,v 1.58 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: iwn.4,v 1.59 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2007,2008
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt IWN 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/iwx.4 b/share/man/man4/iwx.4
index a6ce958bd54..923585d60d1 100644
--- a/share/man/man4/iwx.4
+++ b/share/man/man4/iwx.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwx.4,v 1.9 2021/10/16 15:05:59 jmc Exp $
+.\" $OpenBSD: iwx.4,v 1.10 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 16 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt IWX 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index 36ca077e1b1..c673c4170fd 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.50 2021/10/15 08:10:44 kn Exp $
+.\"	$OpenBSD: malo.4,v 1.51 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2006 Theo de Raadt.
 .\"
@@ -26,7 +26,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/otus.4 b/share/man/man4/otus.4
index cf081de12a9..f7fe9c0313f 100644
--- a/share/man/man4/otus.4
+++ b/share/man/man4/otus.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: otus.4,v 1.34 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: otus.4,v 1.35 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt OTUS 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index 85e18088d2a..89015995e77 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rsu.4,v 1.24 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: rsu.4,v 1.25 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt RSU 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/rtwn.4 b/share/man/man4/rtwn.4
index d572f3cf71b..a43124fe651 100644
--- a/share/man/man4/rtwn.4
+++ b/share/man/man4/rtwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rtwn.4,v 1.11 2021/10/15 08:10:44 kn Exp $
+.\" $OpenBSD: rtwn.4,v 1.12 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\" Copyright (c) 2015 Stefan Sperling <stsp@openbsd.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt RTWN 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index 097327e35d1..7676fd7896d 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: run.4,v 1.55 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: run.4,v 1.56 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4
index 18d25c4fc8a..a5fa9a0a1d7 100644
--- a/share/man/man4/uath.4
+++ b/share/man/man4/uath.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uath.4,v 1.37 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: uath.4,v 1.38 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2006
 .\"     Damien Bergamini <damien.bergamini@free.fr>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt UATH 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index dcda556c81d..bf194e50f19 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.28 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: upgt.4,v 1.29 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
 .\" Copyright (c) 2005-2007
@@ -48,7 +48,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt UPGT 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/urtw.4 b/share/man/man4/urtw.4
index 874f57d7efb..a5c15662180 100644
--- a/share/man/man4/urtw.4
+++ b/share/man/man4/urtw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtw.4,v 1.27 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: urtw.4,v 1.28 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2008 Weongyo Jeong <weongyo@FreeBSD.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt URTW 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index cee12529ac1..f76c2c332f8 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtwn.4,v 1.52 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: urtwn.4,v 1.53 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index 203b927af5c..92545a795e7 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wpi.4,v 1.43 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: wpi.4,v 1.44 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 2006, 2007
 .\"	Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt WPI 4
 .Os
 .Sh NAME
@@ -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
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 2f29deb7b51..e99242f9f9a 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zyd.4,v 1.47 2021/10/15 08:10:45 kn Exp $
+.\" $OpenBSD: zyd.4,v 1.48 2021/10/24 12:32:42 kn Exp $
 .\"
 .\" Copyright (c) 1997, 1998, 1999
 .\" Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 15 2021 $
+.Dd $Mdocdate: October 24 2021 $
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -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
-- 
2.20.1