adjust hostname.if examples to show "wpakey" on the same line as "nwid"

OK jmc@

21 files changed, 69 insertions, 96 deletions

diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index 3f2648a5f78..5b39a3eeb37 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ath.4,v 1.64 2016/04/05 15:12:11 mestre Exp $
+.\"	$OpenBSD: ath.4,v 1.65 2018/07/15 10:44:49 phessler Exp $
 .\"     $NetBSD: ath.4,v 1.5 2004/07/03 16:58:18 mycroft Exp $
 .\"
 .\" Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -42,7 +42,7 @@
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath.4,v 1.16 2004/02/18 08:30:08 maxim Exp $
 .\" parts from $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath_hal.4,v 1.7 2004/01/07 20:49:51 blackend Exp $
 .\"
-.Dd $Mdocdate: April 5 2016 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt ATH 4
 .Os
 .Sh NAME
@@ -202,8 +202,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Pp
@@ -212,8 +211,7 @@ The following
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
 mediaopt hostap
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 inet 192.168.1.1 255.255.255.0
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/athn.4 b/share/man/man4/athn.4
index fe378ed76be..ce0e96c31b3 100644
--- a/share/man/man4/athn.4
+++ b/share/man/man4/athn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: athn.4,v 1.35 2018/05/16 06:19:15 stsp Exp $
+.\" $OpenBSD: athn.4,v 1.36 2018/07/15 10:44:49 phessler 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: May 16 2018 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt ATHN 4
 .Os
 .Sh NAME
@@ -187,8 +187,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Pp
@@ -197,8 +196,7 @@ The following
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
 mediaopt hostap
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 inet 192.168.1.1 255.255.255.0
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/bwfm.4 b/share/man/man4/bwfm.4
index 8a86ea2d910..6bd5bd14aad 100644
--- a/share/man/man4/bwfm.4
+++ b/share/man/man4/bwfm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwfm.4,v 1.7 2018/07/08 14:57:12 sthen Exp $
+.\" $OpenBSD: bwfm.4,v 1.8 2018/07/15 10:44:49 phessler Exp $
 .\"
 .\" Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
 .\"
@@ -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: July 8 2018 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt BWFM 4
 .Os
 .Sh NAME
@@ -88,8 +88,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Pp
@@ -98,8 +97,7 @@ The following
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
 mediaopt hostap
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 inet 192.168.1.1 255.255.255.0
 .Ed
 .Sh SEE ALSO
diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4
index 843578abebe..773c0f4c324 100644
--- a/share/man/man4/bwi.4
+++ b/share/man/man4/bwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bwi.4,v 1.40 2014/02/15 20:28:19 tedu Exp $
+.\" $OpenBSD: bwi.4,v 1.41 2018/07/15 10:44:49 phessler 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: February 15 2014 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt BWI 4
 .Os
 .Sh NAME
@@ -119,8 +119,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh SEE ALSO
diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4
index 4b3c774a9fa..16c95bd54e1 100644
--- a/share/man/man4/ipw.4
+++ b/share/man/man4/ipw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipw.4,v 1.45 2017/10/17 22:47:58 schwarze Exp $
+.\" $OpenBSD: ipw.4,v 1.46 2018/07/15 10:44:49 phessler 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 17 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt IPW 4
 .Os
 .Sh NAME
@@ -121,8 +121,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4
index 1139ae3fb50..0e044e8f561 100644
--- a/share/man/man4/iwi.4
+++ b/share/man/man4/iwi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwi.4,v 1.51 2017/10/17 22:47:58 schwarze Exp $
+.\" $OpenBSD: iwi.4,v 1.52 2018/07/15 10:44:49 phessler 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 17 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt IWI 4
 .Os
 .Sh NAME
@@ -121,8 +121,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4
index 400908c02bc..00cc980c601 100644
--- a/share/man/man4/iwm.4
+++ b/share/man/man4/iwm.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwm.4,v 1.23 2018/05/23 17:50:52 stsp Exp $
+.\" $OpenBSD: iwm.4,v 1.24 2018/07/15 10:44:49 phessler 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: May 23 2018 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt IWM 4
 .Os
 .Sh NAME
@@ -101,8 +101,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index 914672b7a86..40b7c07ac1e 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iwn.4,v 1.51 2016/01/15 18:50:13 tj Exp $
+.\" $OpenBSD: iwn.4,v 1.52 2018/07/15 10:44:49 phessler 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: January 15 2016 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt IWN 4
 .Os
 .Sh NAME
@@ -156,8 +156,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4
index 80cc37822ae..9be53c0ab21 100644
--- a/share/man/man4/malo.4
+++ b/share/man/man4/malo.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malo.4,v 1.46 2017/01/06 13:56:32 tb Exp $
+.\"	$OpenBSD: malo.4,v 1.47 2018/07/15 10:44:49 phessler 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: January 6 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt MALO 4
 .Os
 .Sh NAME
@@ -130,8 +130,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh SEE ALSO
diff --git a/share/man/man4/otus.4 b/share/man/man4/otus.4
index bf9cea45887..58110f61168 100644
--- a/share/man/man4/otus.4
+++ b/share/man/man4/otus.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: otus.4,v 1.30 2017/07/12 05:44:33 bentley Exp $
+.\" $OpenBSD: otus.4,v 1.31 2018/07/15 10:44:49 phessler 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: July 12 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt OTUS 4
 .Os
 .Sh NAME
@@ -117,8 +117,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4
index cd31f33d809..c8241982e6b 100644
--- a/share/man/man4/ral.4
+++ b/share/man/man4/ral.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ral.4,v 1.111 2017/05/31 03:45:15 jsg Exp $
+.\" $OpenBSD: ral.4,v 1.112 2018/07/15 10:44:49 phessler Exp $
 .\"
 .\" Copyright (c) 2005-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: May 31 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt RAL 4
 .Os
 .Sh NAME
@@ -286,8 +286,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Pp
@@ -296,8 +295,7 @@ The following
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
 mediaopt hostap
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 inet 192.168.1.1 255.255.255.0
 .Ed
 .Sh SEE ALSO
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index 87c91fa987a..a0d47f0a1c6 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rsu.4,v 1.19 2017/07/12 05:44:33 bentley Exp $
+.\" $OpenBSD: rsu.4,v 1.20 2018/07/15 10:44:49 phessler 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: July 12 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt RSU 4
 .Os
 .Sh NAME
@@ -111,8 +111,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/rtwn.4 b/share/man/man4/rtwn.4
index 527b55eda98..65ed37e6a93 100644
--- a/share/man/man4/rtwn.4
+++ b/share/man/man4/rtwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rtwn.4,v 1.4 2017/09/03 16:26:57 stsp Exp $
+.\" $OpenBSD: rtwn.4,v 1.5 2018/07/15 10:44:49 phessler 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: September 3 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt RTWN 4
 .Os
 .Sh NAME
@@ -97,8 +97,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/rum.4 b/share/man/man4/rum.4
index 247ed02615e..c089583e80a 100644
--- a/share/man/man4/rum.4
+++ b/share/man/man4/rum.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rum.4,v 1.58 2016/06/16 17:25:32 martijn Exp $
+.\" $OpenBSD: rum.4,v 1.59 2018/07/15 10:44:49 phessler Exp $
 .\"
 .\" Copyright (c) 2005-2007
 .\"	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: June 16 2016 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt RUM 4
 .Os
 .Sh NAME
@@ -162,8 +162,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Pp
@@ -172,8 +171,7 @@ The following
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
 mediaopt hostap
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 inet 192.168.1.1 255.255.255.0
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index ac13bd52087..a4da08777f2 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: run.4,v 1.51 2018/01/30 20:56:38 zhuk Exp $
+.\" $OpenBSD: run.4,v 1.52 2018/07/15 10:44:49 phessler 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: January 30 2018 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -190,8 +190,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4
index 40fc36d7b44..ec6d9bcbacd 100644
--- a/share/man/man4/upgt.4
+++ b/share/man/man4/upgt.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: upgt.4,v 1.24 2015/09/10 15:16:43 schwarze Exp $
+.\" $OpenBSD: upgt.4,v 1.25 2018/07/15 10:44:49 phessler 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: September 10 2015 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt UPGT 4
 .Os
 .Sh NAME
@@ -153,8 +153,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh SEE ALSO
diff --git a/share/man/man4/ural.4 b/share/man/man4/ural.4
index 806bdbb2f58..200dbf8084a 100644
--- a/share/man/man4/ural.4
+++ b/share/man/man4/ural.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ural.4,v 1.22 2016/06/16 17:25:32 martijn Exp $
+.\" $OpenBSD: ural.4,v 1.23 2018/07/15 10:44:49 phessler Exp $
 .\"
 .\" Copyright (c) 2005-2007
 .\"	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: June 16 2016 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt URAL 4
 .Os
 .Sh NAME
@@ -140,8 +140,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Pp
@@ -150,8 +149,7 @@ The following
 example creates a host-based access point on boot:
 .Bd -literal -offset indent
 mediaopt hostap
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 inet 192.168.1.1 255.255.255.0
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/urtw.4 b/share/man/man4/urtw.4
index ab51f41589f..f19854e60a7 100644
--- a/share/man/man4/urtw.4
+++ b/share/man/man4/urtw.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtw.4,v 1.23 2017/01/06 13:56:32 tb Exp $
+.\" $OpenBSD: urtw.4,v 1.24 2018/07/15 10:44:49 phessler 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: January 6 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt URTW 4
 .Os
 .Sh NAME
@@ -97,8 +97,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh SEE ALSO
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index f18e1f97af8..a980eb3fa6d 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: urtwn.4,v 1.41 2017/12/14 09:26:11 benno Exp $
+.\" $OpenBSD: urtwn.4,v 1.42 2018/07/15 10:44:49 phessler 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: December 14 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -145,8 +145,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4
index 7cc3e92d988..3abf1a0f704 100644
--- a/share/man/man4/wpi.4
+++ b/share/man/man4/wpi.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wpi.4,v 1.39 2017/10/17 22:47:58 schwarze Exp $
+.\" $OpenBSD: wpi.4,v 1.40 2018/07/15 10:44:49 phessler 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 17 2017 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt WPI 4
 .Os
 .Sh NAME
@@ -108,8 +108,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/zyd.4 b/share/man/man4/zyd.4
index 9610fcb8104..6fa6b29f12d 100644
--- a/share/man/man4/zyd.4
+++ b/share/man/man4/zyd.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zyd.4,v 1.43 2014/02/15 20:28:19 tedu Exp $
+.\" $OpenBSD: zyd.4,v 1.44 2018/07/15 10:44:49 phessler 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: February 15 2014 $
+.Dd $Mdocdate: July 15 2018 $
 .Dt ZYD 4
 .Os
 .Sh NAME
@@ -159,8 +159,7 @@ using WPA key
 .Dq mywpakey ,
 obtaining an IP address using DHCP:
 .Bd -literal -offset indent
-nwid mynwid
-wpakey mywpakey
+nwid mynwid wpakey mywpakey
 dhcp
 .Ed
 .Sh DIAGNOSTICS