diff options
author | murray <murray@FreeBSD.org> | 2002-02-19 12:43:18 +0000 |
---|---|---|
committer | murray <murray@FreeBSD.org> | 2002-02-19 12:43:18 +0000 |
commit | dfedbefce858fb5578a49dc4b51ff6435f8e84f0 (patch) | |
tree | c43a2eacf2ece8094df1bb6db0033d6c4682f648 /contrib/isc-dhcp | |
parent | 0c707a43cc97972d895eda47c1e2ab3960484e61 (diff) | |
download | FreeBSD-src-dfedbefce858fb5578a49dc4b51ff6435f8e84f0.zip FreeBSD-src-dfedbefce858fb5578a49dc4b51ff6435f8e84f0.tar.gz |
Resolve conflicts. Remove references to dhcpd from the man page,
since only the client exists in the base system.
Diffstat (limited to 'contrib/isc-dhcp')
-rw-r--r-- | contrib/isc-dhcp/client/dhclient.leases.5 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/contrib/isc-dhcp/client/dhclient.leases.5 b/contrib/isc-dhcp/client/dhclient.leases.5 index 32ef380..d19737c 100644 --- a/contrib/isc-dhcp/client/dhclient.leases.5 +++ b/contrib/isc-dhcp/client/dhclient.leases.5 @@ -31,10 +31,13 @@ .\" SUCH DAMAGE. .\" .\" This software has been written for the Internet Software Consortium -.\" by Ted Lemon <mellon@fugue.com> in cooperation with Vixie +.\" by Ted Lemon in cooperation with Vixie .\" 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''. +.\" +.\" $FreeBSD$ +.\" .TH dhclient.leases 5 .SH NAME dhclient.leases - DHCP client lease database @@ -49,14 +52,14 @@ this is not an unusual occurrance. The format of the lease declarations is described in .B dhclient.conf(5). .SH FILES -.B /var/db/dhclient.leases +.B DBDIR/dhclient.leases .SH SEE ALSO -dhcp-options(5), dhclient.conf(5), dhclient(8), -RFC2132, RFC2131 +dhclient(8), dhcp-options(5), dhclient.conf(5), +RFC2132, RFC2131. .SH AUTHOR .B dhclient(8) -was written by Ted Lemon <mellon@vix.com> +was written by Ted Lemon under a contract with Vixie Labs. Funding -for this project was provided by the Internet Software Corporation. +for this project was provided by the Internet Software Consortium. Information about the Internet Software Consortium can be found at -.B http://www.isc.org/isc. +.B http://www.isc.org. |