[master] Tidy up the options descriptions

correct the types for some options

add associated-ip and client-last-transaction-time for lease query

diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
index 72aa51fd9ad1f183232c19eb3f7b478dabb14b52..9b3be1dcc2948babb4de8ad94a970cc470eed9fa 100644 (file)
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -177,6 +177,16 @@ some subnets of the directly connected network may have smaller MTUs.
 This option specifies the timeout in seconds for ARP cache entries.
 .RE
 .PP
+.B option \fBassociated-ip\fR \fIip-address\fR [\fB,\fR
+\fIip-address\fR... ]\fB;\fR
+.RS 0.25i
+.PP
+This option is part of lease query.  It is used to
+return all of the IP addresses associated with a given DHCP client.
+.PP
+This option is not user configurable.
+.RE
+.PP
 .B option \fBbcms-controller-address\fR \fIip-address\fR [\fB,\fR
 \fIip-address\fR... ]\fB;\fR
 .RS 0.25i
@@ -230,6 +240,17 @@ The addresses are listed in preference order.
 This option is included based on RFC 5417.
 .RE
 .PP
+.B option \fBclient-last-transaction-time\fR \fIuint32\fR\fB;\fR
+.RS 0.25i
+.PP
+This option is part of lease query.  It allows the
+receiver to determine the time of the most recent access by the
+client.  The value is a duration in seconds from when the client
+last communicated with the DHCP server.
+.PP
+This option is not user configurable.
+.RE
+.PP
 .B option \fBcookie-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...
 ]\fB;\fR
 .RS 0.25i
@@ -361,8 +382,8 @@ This option is not user configurable.
 .PP
 .RE
 .PP
-.B option \fBdhcp-parameter-request-list\fR \fIuint16\fR [\fB,\fR
-\fIuint16\fR... ]\fB;\fR
+.B option \fBdhcp-parameter-request-list\fR \fIuint8\fR [\fB,\fR
+\fIuint8\fR... ]\fB;\fR
 .RS 0.25i
 .PP
 This option, when sent by the client, specifies which options the
@@ -1026,7 +1047,7 @@ assigned will override the subnet mask specified in the subnet
 declaration.
 .RE
 .PP
-.B option \fBsubnet-selection\fR \fIstring\fR\fB;\fR
+.B option \fBsubnet-selection\fR \fIip-address\fR\fB;\fR
 .RS 0.25i
 .PP
 Sent by the client if an address is required in a subnet other than the one
@@ -1771,7 +1792,7 @@ have some vendor-specific structure (similar to VSIO), but we have chosen
 to treat this option as an opaque field.
 .RE
 .PP
-.B option \fBdhcp6.subscriber-id\fR\fB;\fR
+.B option \fBdhcp6.subscriber-id\fR \fIstring\fR\fB;\fR
 .RS 0.25i
 .PP
 The \fBsubscriber-id\fR option is an opaque field provided by the relay agent,