summaryrefslogtreecommitdiff
path: root/common/dhcp-options.5
diff options
context:
space:
mode:
Diffstat (limited to 'common/dhcp-options.5')
-rw-r--r--common/dhcp-options.520
1 files changed, 16 insertions, 4 deletions
diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
index 0d2fdac8..6865a62f 100644
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -1,4 +1,4 @@
-.\" $Id: dhcp-options.5,v 1.49 2010/07/20 21:09:14 dhankins Exp $
+.\" $Id: dhcp-options.5,v 1.50 2011/05/20 13:48:32 tomasz Exp $
.\"
.\" Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -1451,9 +1451,7 @@ configured.
.RS 0.25i
.PP
The \fBrapid-commit\fR option is a zero-length option that clients use
-to indicate their desire to enter into rapid-commit with the server. This
-option is not supported by the client at this time, and is digested by
-the server when present, so should not be configured.
+to indicate their desire to enter into rapid-commit with the server.
.RE
.PP
.B option \fBdhcp6.vendor-opts\fR \fIstring\fR\fB;\fR
@@ -1589,6 +1587,13 @@ The \fBnis-domain-name\fR option specifies the NIS domain name the client is
expected to use, and is related to the \fBnis-servers\fR option.
.RE
.PP
+.B option \fBdhcp6.nis-domain-name\fR \fIdomain-name\fR\fB;\fR
+.RS 0.25i
+.PP
+The \fBdhcp6.nis-domain-name\fR option specfies NIS domain name the
+client is expected to use, and is related to \fBdhcp6.nis-servers\fR option.
+.RE
+.PP
.B option \fBnisp-domain-name\fR \fIdomain-list\fR\fB;\fR
.RS 0.25i
.PP
@@ -1596,6 +1601,13 @@ The \fBnisp-domain-name\fR option specifies the NIS+ domain name the client
is expected to use, and is related to the \fBnisp-servers\fR option.
.RE
.PP
+.B option \fBdhcp6.nisp-domain-name\fR \fIdomain-name\fR\fB;\fR
+.RS 0.25i
+.PP
+The \fBdhcp6.nis-domain-name\fR option specfies NIS+ domain name the
+client is expected to use, and is related to \fBdhcp6.nisp-servers\fR option.
+.RE
+.PP
.B option
.B dhcp6.sntp-servers
.I ip6-address \fR[\fB,