Emil Mikulic pointed out there are two copies of this stuff (thanks!) ...

- correct option is `dhcp-lease-time', not `requested-lease-time'; fixed
w/ help from krw@
- kill a rake of unnecessary .Pp's

2 files changed, 3 insertions, 12 deletions

diff --git a/sbin/dhclient/dhclient.conf.5 b/sbin/dhclient/dhclient.conf.5
index 88ac76965eb..640301c0711 100644
--- a/sbin/dhclient/dhclient.conf.5
+++ b/sbin/dhclient/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhclient.conf.5,v 1.1 2004/01/18 01:26:20 deraadt Exp $
+.\"	$OpenBSD: dhclient.conf.5,v 1.2 2004/04/04 15:12:02 jmc Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -80,7 +80,6 @@ the server.
 .Pp
 The following statements can be used to adjust the timing behaviour of
 the DHCP client if required, however:
-.Pp
 .Bl -tag -width Ds
 .It Ic timeout Ar time ;
 The
@@ -170,7 +169,6 @@ The data that can be specifically requested is what are called
 .Em DHCP Options .
 DHCP Options are defined in
 .Xr dhcp-options 5 .
-.Pp
 .Bl -tag -width Ds
 .It Xo
 .Ic request Op Ar option
@@ -202,7 +200,7 @@ These are full option declarations as described in
 .Xr dhcp-options 5 .
 Options that are always sent in the DHCP protocol should not be specified
 here, except that the client can specify a
-.Ar requested-lease-time
+.Ar dhcp-lease-time
 option other than the default requested lease time, which is two hours.
 The other obvious use for this statement is to send information to the server
 that will allow it to differentiate between this client and other
@@ -215,7 +213,6 @@ information that it needs, and for which a useful default value exists.
 It may also receive information which is useful, but which needs to be
 supplemented with local information.
 To handle these needs, several option modifiers are available.
-.Pp
 .Bl -tag -width Ds
 .It Xo
 .Ic default No { Op Ar option declaration
@@ -266,7 +263,6 @@ This restriction is not enforced \- if you ignore it,
 the behaviour will be unpredictable.
 .El
 .Sh LEASE DECLARATIONS
-.Pp
 The lease declaration:
 .Pp
 .Xo
@@ -301,7 +297,6 @@ A lease statement consists of the lease keyword, followed by a left
 curly brace, followed by one or more lease declaration statements,
 followed by a right curly brace.
 The following lease declarations are possible:
-.Pp
 .Bl -tag -width Ds
 .It Ic bootp ;
 The
@@ -420,7 +415,6 @@ The hour is a number between 0 and 23,
 the minute a number between 0 and 69,
 and the second also a number between 0 and 69.
 .Sh ALIAS DECLARATIONS
-.Pp
 .Ic alias No { Ar declarations ... No }
 .Pp
 Some DHCP clients running TCP/IP roaming protocols may require that in
@@ -442,7 +436,6 @@ A typical alias declaration includes an interface declaration, a fixed-address
 declaration for the IP alias address, and a subnet-mask option declaration.
 A medium statement should never be included in an alias declaration.
 .Sh OTHER DECLARATIONS
-.Pp
 .Bl -tag -width Ds
 .It Ic reject Ar ip-address ;
 The
diff --git a/sbin/dhclient/dhcp-options.5 b/sbin/dhclient/dhcp-options.5
index 72d978353ef..f992e4c13c7 100644
--- a/sbin/dhclient/dhcp-options.5
+++ b/sbin/dhclient/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dhcp-options.5,v 1.1 2004/01/18 01:26:20 deraadt Exp $
+.\"	$OpenBSD: dhcp-options.5,v 1.2 2004/04/04 15:12:02 jmc Exp $
 .\"
 .\" Copyright (c) 1995, 1996, 1997, 1998 The Internet Software Consortium.
 .\" All rights reserved.
@@ -130,7 +130,6 @@ These options may be followed either by a string, enclosed in quotes, or by
 a series of octets, expressed as two-digit hexadecimal numbers separated
 by colons.
 For example:
-.Pp
 .Bd -literal -offset indent
 option option-133 "my-option-133-text";
 option option-129 1:54:c9:2b:47;
@@ -439,7 +438,6 @@ are configurable to be configured as described in RFC 1001/1002.
 The value is specified as a single octet which identifies the client type.
 .Pp
 Possible node types are:
-.Pp
 .Bl -tag -width Ds
 .It 1
 B-node: Broadcast - no WINS