- expand DBDIR, ETCDIR, RUNDIR to the actual directories to make

  the man pages easier to read
- add dhcp(8) to SEE ALSO in dhcpd(8)
- rearrange SEE ALSO in section order as well as alphabetical in dhcpd(8)

ok millert@, todd@

2 files changed, 8 insertions, 8 deletions

diff --git a/usr.sbin/dhcp/server/dhcpd.8 b/usr.sbin/dhcp/server/dhcpd.8
index 9b02bad8a19..272de899939 100644
--- a/usr.sbin/dhcp/server/dhcpd.8
+++ b/usr.sbin/dhcp/server/dhcpd.8
@@ -329,10 +329,10 @@ use a different name server might be declared as follows:
 A more complete description of the dhcpd.conf file syntax is provided
 in dhcpd.conf(5).
 .SH FILES
-.B ETCDIR/dhcpd.conf, DBDIR/dhcpd.leases, RUNDIR/dhcpd.pid,
-.B DBDIR/dhcpd.leases~.
+.B /etc/dhcpd.conf, /var/db/dhcpd.leases, /var/run/dhcpd.pid,
+.B /var/db/dhcpd.leases~.
 .SH SEE ALSO
-dhclient(8), dhcrelay(8), dhcpd.conf(5), dhcpd.leases(5)
+dhcpd.conf(5), dhcpd.leases(5), dhclient(8), dhcp(8), dhcrelay(8)
 .SH AUTHOR
 .B dhcpd(8)
 was written by Ted Lemon <mellon@vix.com>
diff --git a/usr.sbin/dhcp/server/dhcpd.leases.5 b/usr.sbin/dhcp/server/dhcpd.leases.5
index 439ef12f530..d01e7b17835 100644
--- a/usr.sbin/dhcp/server/dhcpd.leases.5
+++ b/usr.sbin/dhcp/server/dhcpd.leases.5
@@ -49,22 +49,22 @@ for a given lease, the last one in the file is the current one.
 When dhcpd is first installed, there is no lease database.   However,
 dhcpd requires that a lease database be present before it will start.
 To make the initial lease database, just create an empty file called
-DBDIR/dhcpd.leases.
+/var/db/dhcpd.leases.
 .PP
 In order to prevent the lease database from growing without bound, the
 file is rewritten from time to time.   First, a temporary lease
 database is created and all known leases are dumped to it.   Then, the
-old lease database is renamed DBDIR/dhcpd.leases~.   Finally, the
+old lease database is renamed /var/db/dhcpd.leases~.   Finally, the
 newly written lease database is moved into place.
 .PP
 There is a window of vulnerability where if the dhcpd process is
 killed or the system crashes after the old lease database has been
 renamed but before the new one has been moved into place, there will
-be no DBDIR/dhcpd.leases.   In this case, dhcpd will refuse to start,
+be no /var/db/dhcpd.leases.   In this case, dhcpd will refuse to start,
 and will require manual intervention.   \fBDO NOT\fR simply create a
 new lease file when this happens - if you do, you will lose all your
 old bindings, and chaos will ensue.   Instead, rename
-DBDIR/dhcpd.leases~ to DBDIR/dhcpd.leases, restoring the old, valid
+/var/db/dhcpd.leases~ to /var/db/dhcpd.leases, restoring the old, valid
 lease file, and then start dhcpd.   This guarantees that a valid lease
 file will be restored.
 .SH FORMAT
@@ -162,7 +162,7 @@ corrupted, and that the client is the machine that responded when the
 lease was probed, causing it to be abandoned.   In that case, the
 address is immediately assigned to the client.
 .SH FILES
-.B DBDIR/dhcpd.leases
+.B /var/db/dhcpd.leases
 .SH SEE ALSO
 dhcpd(8), dhcp-options(5), dhcpd.conf(5), RFC2132, RFC2131.
 .SH AUTHOR