From 7fa39cc0dabcf10e473ad5c5f5006de7f1e47c76 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 10 Mar 2021 17:00:16 +0000
Subject: [PATCH] cleanup the 3 ways (2 for ipv4, 1 for ipv6) of doing dynamic
 address allocation. not the perfect text yet, but it is better. discussed
 with florian and jmc

---
 share/man/man5/hostname.if.5 | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5
index e8e7ac03c2b..748e549d4eb 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.74 2021/03/08 16:12:28 florian Exp $
+.\"	$OpenBSD: hostname.if.5,v 1.75 2021/03/10 17:00:16 deraadt Exp $
 .\"	$NetBSD: hosts.5,v 1.4 1994/11/30 19:31:20 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)hosts.5	8.2 (Berkeley) 12/11/93
 .\"
-.Dd $Mdocdate: March 8 2021 $
+.Dd $Mdocdate: March 10 2021 $
 .Dt HOSTNAME.IF 5
 .Os
 .Sh NAME
@@ -226,19 +226,15 @@ up
 .Ed
 .El
 .Sh DYNAMIC ADDRESS CONFIGURATION
-The following packed formats are valid for configuring network interfaces
-with dynamic addresses.
+IPv4 dynamic addressing using DHCP can be done in two forms:
 .Pp
-For IPv4 dynamic addressing using DHCP, the literal string
+The token
 .Dq dhcp
 followed first by
 .Xr dhclient 8
 options and then by
 .Xr ifconfig 8
-options.
-Note that
-.Xr ifconfig 8
-is executed before
+options, which are handled before starting
 .Xr dhclient 8 .
 .Bd -ragged -offset indent
 .Li dhcp
@@ -246,7 +242,17 @@ is executed before
 .Op Va ifconfig_options
 .Ed
 .Pp
-For IPv6 stateless address autoconfiguration the literal string
+Alternatively, the literal string
+.Dq inet autoconf
+followed by any options to be passed to
+.Xr ifconfig 8 .
+.Bd -ragged -offset indent
+.Li inet4 autoconf
+.Op Va ifconfig_options
+.Ed
+.Pp
+IPv6 stateless address autoconfiguration is requested using
+the literal string
 .Dq inet6 autoconf
 followed by any options to be passed to
 .Xr ifconfig 8 .
@@ -254,6 +260,11 @@ followed by any options to be passed to
 .Li inet6 autoconf
 .Op Va ifconfig_options
 .Ed
+.Pp
+The
+.Va autoconf
+configurations will communicate learned DNS information to
+.Xr resolvd 8 .
 .Sh BRIDGE INTERFACE CONFIGURATION
 If the network interface is a bridge, the options described in
 the bridge section of the
-- 
2.20.1