merge the relevant bits of dhcp(8) into dhclient(8) and dhcpd(8),

removing traces of dhcp(8)... i'm about to remove that file, since
it's essentially useless. holding off for a little, in case my commit
is greeted with howls.

help/ok krw

5 files changed, 46 insertions, 24 deletions

diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index 83433ff7d25..ee8b12e9aa6 100644
--- a/sbin/dhclient/dhclient.8
+++ b/sbin/dhclient/dhclient.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dhclient.8,v 1.21 2013/07/11 15:15:46 jmc Exp $
+.\" $OpenBSD: dhclient.8,v 1.22 2013/07/14 19:44:38 jmc Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .\" Enterprises.  To learn more about the Internet Software Consortium,
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
-.Dd $Mdocdate: July 11 2013 $
+.Dd $Mdocdate: July 14 2013 $
 .Dt DHCLIENT 8
 .Os
 .Sh NAME
@@ -50,15 +50,36 @@
 .Op Fl l Ar file
 .Ar interface
 .Sh DESCRIPTION
-The
-.Nm
-utility provides a means for configuring network interfaces using DHCP, BOOTP,
-or if these protocols fail, by statically assigning an address.
+The Dynamic Host Configuration Protocol (DHCP) allows hosts on a TCP/IP network
+to configure one or more network interfaces based on information collected from
+a DHCP server.
+DHCP is often used, for example, by cable modem and DSL network
+providers to automate network configuration for their customers.
+.Pp
+Information typically provided via DHCP includes
+address and subnet mask for the interface,
+default route,
+and domain name server.
 .Pp
-The name of the network interface that
+To have
+.Ox
+configure an interface using DHCP
+(or its predecessor, BOOTP)
+the
+.Nm
+utility is used.
+.Nm
+is run on the command line with the name of the
+.Ar interface
+to be configured.
+.Nm
+can also be run at boot time from
+.Xr hostname.if 5 ,
+in which case
+.Xr netstart 8
+reads the hostname files and runs
 .Nm
-should attempt to
-configure must be specified on the command line.
+for each interface that is to be configured via DHCP.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
@@ -274,6 +295,8 @@ or temporary files it created.
 .Bl -tag -width "/var/db/dhclient.leases.<IFNAME>XXX" -compact
 .It Pa /etc/dhclient.conf
 DHCP client configuration file
+.It Pa /etc/hostname.XXX
+interface-specific configuration files
 .It Pa /var/db/dhclient.leases. Ns Aq Ar IFNAME
 database of acquired leases
 .El
@@ -281,7 +304,7 @@ database of acquired leases
 .Xr bpf 4 ,
 .Xr dhclient.conf 5 ,
 .Xr dhclient.leases 5 ,
-.Xr dhcp 8 ,
+.Xr hostname.if 5 ,
 .Xr dhcpd 8 ,
 .Xr dhcrelay 8
 .Sh STANDARDS
diff --git a/share/man/man5/hostname.if.5 b/share/man/man5/hostname.if.5
index 161769ad4fd..be1185da85d 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.60 2013/01/18 21:48:43 jmc Exp $
+.\"	$OpenBSD: hostname.if.5,v 1.61 2013/07/14 19:44:39 jmc 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: January 18 2013 $
+.Dd $Mdocdate: July 14 2013 $
 .Dt HOSTNAME.IF 5
 .Os
 .Sh NAME
@@ -300,7 +300,7 @@ Interface-specific configuration files.
 .El
 .Sh SEE ALSO
 .Xr hosts 5 ,
-.Xr dhcp 8 ,
+.Xr dhclient 8 ,
 .Xr ifconfig 8 ,
 .Xr lmccontrol 8 ,
 .Xr netstart 8 ,
diff --git a/share/man/man5/resolv.conf.5 b/share/man/man5/resolv.conf.5
index 6eef0e0a935..1ea47b900c2 100644
--- a/share/man/man5/resolv.conf.5
+++ b/share/man/man5/resolv.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: resolv.conf.5,v 1.43 2012/12/15 16:04:13 jmc Exp $
+.\"	$OpenBSD: resolv.conf.5,v 1.44 2013/07/14 19:44:39 jmc Exp $
 .\"	$NetBSD: resolv.conf.5,v 1.7 1996/03/06 18:22:16 scottr Exp $
 .\"
 .\" Copyright (c) 1986, 1991 The Regents of the University of California.
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)resolver.5	5.12 (Berkeley) 5/10/91
 .\"
-.Dd $Mdocdate: December 15 2012 $
+.Dd $Mdocdate: July 14 2013 $
 .Dt RESOLV.CONF 5
 .Os
 .Sh NAME
@@ -347,7 +347,7 @@ file.
 .Xr resolver 3 ,
 .Xr hosts 5 ,
 .Xr hostname 7 ,
-.Xr dhcp 8 ,
+.Xr dhclient 8 ,
 .Xr named 8
 .Sh HISTORY
 The
diff --git a/share/man/man8/afterboot.8 b/share/man/man8/afterboot.8
index e0dc78ba912..367092020b2 100644
--- a/share/man/man8/afterboot.8
+++ b/share/man/man8/afterboot.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: afterboot.8,v 1.140 2012/10/30 18:39:44 krw Exp $
+.\"	$OpenBSD: afterboot.8,v 1.141 2013/07/14 19:44:39 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Marshall M. Midden
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: October 30 2012 $
+.Dd $Mdocdate: July 14 2013 $
 .Dt AFTERBOOT 8
 .\" Originally created by Marshall M. Midden -- 1997-10-20, m4@umn.edu
 .Os
@@ -198,7 +198,7 @@ See
 for instructions on configuring multicast routing.
 .Pp
 See
-.Xr dhcp 8
+.Xr hostname.if 5
 for instructions on configuring interfaces with DHCP.
 .Ss Check routing tables
 Issue a
diff --git a/usr.sbin/dhcpd/dhcpd.8 b/usr.sbin/dhcpd/dhcpd.8
index 172a42b9e89..6e55d689a9d 100644
--- a/usr.sbin/dhcpd/dhcpd.8
+++ b/usr.sbin/dhcpd/dhcpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcpd.8,v 1.19 2013/07/11 15:15:46 jmc Exp $
+.\"	$OpenBSD: dhcpd.8,v 1.20 2013/07/14 19:44:38 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: July 11 2013 $
+.Dd $Mdocdate: July 14 2013 $
 .Dt DHCPD 8
 .Os
 .Sh NAME
@@ -447,9 +447,9 @@ All hosts using synchronisation must use the same configuration in the
 file.
 .Sh FILES
 .Bl -tag -width "/var/db/dhcpd.leases~  " -compact
-.It /etc/dhcpd.conf
+.It Pa /etc/dhcpd.conf
 DHCPD configuration file.
-.It /var/db/dhcpd.leases
+.It Pa /var/db/dhcpd.leases
 DHCPD lease file.
 .El
 .Sh SEE ALSO
@@ -457,7 +457,6 @@ DHCPD lease file.
 .Xr dhcpd.conf 5 ,
 .Xr dhcpd.leases 5 ,
 .Xr dhclient 8 ,
-.Xr dhcp 8 ,
 .Xr dhcrelay 8 ,
 .Xr pxeboot 8
 .Sh STANDARDS