summaryrefslogtreecommitdiff
path: root/share/man/man5
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2020-12-22 17:18:10 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2020-12-22 17:18:10 +0000
commit8a41b9bbc271cb478fb05412aa48f02f68e5c629 (patch)
treec4dc5b43d06786e5546137c6c19cf253591c01f1 /share/man/man5
parent17f6e7daa3e954558f55bfc4f3ea6dde6896bd10 (diff)
further tidy up the dynamic address section, and try to keep it and the static
section a little more consistent; ok krw
Diffstat (limited to 'share/man/man5')
-rw-r--r--share/man/man5/hostname.if.533
1 files changed, 16 insertions, 17 deletions
diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5
index 215eddfe120..103e89b0d9c 100644
--- a/share/man/man5/hostname.if.5
+++ b/share/man/man5/hostname.if.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hostname.if.5,v 1.71 2020/12/22 00:11:03 jmc Exp $
+.\" $OpenBSD: hostname.if.5,v 1.72 2020/12/22 17:18:09 jmc Exp $
.\" $NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -76,7 +76,7 @@ would run ifconfig to set the nwid and wpakey of the interface, run it again to
.Xr dhclient 8 .
.Sh STATIC ADDRESS CONFIGURATION
The following packed formats are valid for configuring network
-interfaces with static addresses:
+interfaces with static addresses.
.Pp
Regular IPv4 network setup:
.Bd -ragged -offset indent
@@ -226,34 +226,33 @@ up
.Ed
.El
.Sh DYNAMIC ADDRESS CONFIGURATION
-The following packed formats are provided for configuring network
-interfaces using IPv4 DHCP or IPv6 stateless address autoconfiguration.
-.Bd -ragged -offset indent
-.Li dhcp
-.Op Va options
-.Pp
-.Li inet6 autoconf
-.Op Va options
-.Ed
+The following packed formats are valid for configuring network interfaces
+with dynamic addresses.
.Pp
-For IPv4 DHCP the literal string
+For IPv4 dynamic addressing using DHCP, the literal string
.Dq dhcp
followed by any options to be passed to
.Xr ifconfig 8 .
Note that
.Xr ifconfig 8
-will be executed before
+is executed before
.Xr dhclient 8 .
+.Bd -ragged -offset indent
+.Li dhcp
+.Op Va options
+.Ed
.Pp
-For IPv6 stateless address autoconfiguration the literal strings
-.Dq inet6
-and
-.Dq autoconf
+For IPv6 stateless address autoconfiguration the literal string
+.Dq inet6 autoconf
followed by any options to be passed to
.Xr ifconfig 8 .
Note that
.Xr slaacd 8
must also be enabled.
+.Bd -ragged -offset indent
+.Li inet6 autoconf
+.Op Va options
+.Ed
.Sh BRIDGE INTERFACE CONFIGURATION
If the network interface is a bridge, the options described in
the bridge section of the