Remove some anachronisms and use consistant form and markup for

"/var/db/dhclient.leases.<IFNAME>".

Tweak and ok jmc@

2 files changed, 18 insertions, 17 deletions

diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index f7c543e2b7b..4bfd85f9a4c 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.conf.5,v 1.27 2013/02/09 16:44:37 jmc Exp $
+.\"	$OpenBSD: dhclient.conf.5,v 1.28 2013/02/24 12:18:43 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,7 +36,7 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: February 9 2013 $
+.Dd $Mdocdate: February 24 2013 $
 .Dt DHCLIENT.CONF 5
 .Os
 .Sh NAME
@@ -46,8 +46,7 @@
 The
 .Nm
 file contains configuration information for
-.Xr dhclient 8 ,
-the Internet Software Consortium DHCP Client.
+.Xr dhclient 8 .
 .Pp
 The
 .Nm
@@ -287,10 +286,10 @@ This is done with the
 statement.
 .Pp
 NOTE: the lease statement is also used in the
-.Pa dhclient.leases
+.Pa /var/db/dhclient.leases. Ns Aq Ar IFNAME
 file in order to record leases that have been received from DHCP servers.
 Some of the syntax for leases as described below is only needed in the
-.Pa dhclient.leases
+.Pa /var/db/dhclient.leases. Ns Aq Ar IFNAME
 file.
 Such syntax is documented here for completeness.
 .Pp
diff --git a/sbin/dhclient/dhclient.leases.5 b/sbin/dhclient/dhclient.leases.5
index bbf9578b586..ed575673e9b 100644
--- a/sbin/dhclient/dhclient.leases.5
+++ b/sbin/dhclient/dhclient.leases.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.leases.5,v 1.7 2012/09/22 20:09:43 jmc Exp $
+.\"	$OpenBSD: dhclient.leases.5,v 1.8 2013/02/24 12:18:43 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -36,37 +36,39 @@
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
 .\"
-.Dd $Mdocdate: September 22 2012 $
+.Dd $Mdocdate: February 24 2013 $
 .Dt DHCLIENT.LEASES 5
 .Os
 .Sh NAME
 .Nm dhclient.leases
 .Nd DHCP client lease database
 .Sh DESCRIPTION
-The Internet Software Consortium DHCP client keeps a persistent
-database of leases that it has acquired that are still valid.
+.Xr dhclient 8
+keeps a persistent database of leases that it has acquired that are still
+valid.
 The database is a free-form ASCII file containing one valid declaration
 per lease.
-If more than one declaration appears for a given lease,
-the last one in the file is used.
-The file is written as a log, so this is not an unusual occurrence.
+The file is written as a log, so the last declaration is the most recent
+lease obtained.
 .Pp
 The lease file is named
-.Qq dhclient.leases.IFNAME ,
+.Pa /var/db/dhclient.leases. Ns Aq Ar IFNAME ,
 where
 .Qq IFNAME
-represents the network interface the DHCP client acquired the lease on.
+represents the network interface
+.Xr dhclient 8
+acquired the lease on.
 For example, if
 .Xr dhclient 8
 is configured for the em0 network device,
 the lease file will be named
-.Qq dhclient.leases.em0 .
+.Pa /var/db/dhclient.leases.em0 ,
 .Pp
 The format of the lease declarations is described in
 .Xr dhclient.conf 5 .
 .Sh FILES
 .Bl -tag -width "/var/db/dhclient.leases.IFNAME   "
-.It /var/db/dhclient.leases.IFNAME
+.It Pa /var/db/dhclient.leases. Ns Aq Ar IFNAME ,
 Current lease file.
 .El
 .Sh SEE ALSO