Pulling work between V3-0-4B3 and present v3-release-branch to HEAD.

2 files changed, 17 insertions, 4 deletions

diff --git a/common/dhcp-eval.5 b/common/dhcp-eval.5
index 61f6fd3b..14c9e650 100644
--- a/common/dhcp-eval.5
+++ b/common/dhcp-eval.5
@@ -1,4 +1,4 @@
-.\"	$Id: dhcp-eval.5,v 1.19 2005/03/17 20:14:57 dhankins Exp $
+.\"	$Id: dhcp-eval.5,v 1.20 2006/05/05 20:32:30 dhankins Exp $
 .\"
 .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -468,7 +468,7 @@ of the record is the leased address, reversed, with ".in-addr.arpa"
 concatenated.  The right hand side is the fully qualified domain name
 of the client to which the address is being leased.
 .SH SEE ALSO
-dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcp-eval(5), dhcpd(8),
+dhcpd.conf(5), dhcpd.leases(5), dhclient.conf(5), dhcp-options(5), dhcpd(8),
 dhclient(8), RFC2132, RFC2131.
 .SH AUTHOR
 The Internet Systems Consortium DHCP Distribution was written by Ted
diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
index 14b7b48c..777874a9 100644
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -1,6 +1,6 @@
-.\"	$Id: dhcp-options.5,v 1.27 2006/04/26 15:13:11 dhankins Exp $
+.\"	$Id: dhcp-options.5,v 1.28 2006/05/05 20:32:30 dhankins Exp $
 .\"
-.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+.\" Copyright (c) 2004-2006 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -1069,6 +1069,19 @@ and it should generally be assumed to be an opaque object that is
 administratively guaranteed to be unique to a particular remote end of
 a circuit.
 .RE
+.PP
+.B option \fBagent.DOCSIS-device-class\fR \fIuint32\fR\fB;\fR
+.RS 0.25i
+.PP
+The DOCSIS-device-class suboption is intended to convey information about
+the host endpoint, hardware, and software, that either the host operating
+system or the DHCP server may not otherwise be aware of (but the relay is
+able to distinguish).  This is implemented as a 32-bit field (4 octets),
+each bit representing a flag describing the host in one of these ways.
+So far, only bit zero (being the least significant bit) is defined in
+RFC3256.  If this bit is set to one, the host is considered a CPE
+Controlled Cable Modem (CCCM).  All other bits are reserved.
+.RE
 .SH THE CLIENT FQDN SUBOPTIONS
 The Client FQDN option, currently defined in the Internet Draft
 draft-ietf-dhc-fqdn-option-00.txt is not a standard yet, but is in