- Helpfully (hopefully) edit documentation in dhcp-options to reinforce that

  the ia* options are not for direct configuration, and are only documented
  for completeness...

diff --git a/RELNOTES b/RELNOTES
index 453feb292275768395699cbd4c4b49d66ee16009..635b9354967f0581329a534e4cd26633b7cf6a03 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -45,6 +45,9 @@ work on other platforms. Please report any problems and suggested fixes to
 - When using 'ignore client-updates;', the FQDN returned to the client
   is no longer truncated to one octet.
 
+- Manpage entries for the ia-pd and ia-prefix options were updated to
+  reflect support for prefix delegation.
+
                        Changes since 4.1.0 (new features)
 
 - Failover port configuration can now be left to defaults (port 647) as

diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
index e5b956f5ba3b4b418b1e969dabfc314b561f7c0b..2964d92d68a279f64aa89e2bd928f889f751faef 100644 (file)
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"    $Id: dhcp-options.5,v 1.46 2009/11/24 02:06:56 sar Exp $
+.\"    $Id: dhcp-options.5,v 1.47 2010/01/21 22:17:17 dhankins Exp $
 .\"
 .\" Copyright (c) 2004-2009 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -1546,18 +1546,18 @@ the "search" line in /etc/resolv.conf.
 .RS 0.25i
 .PP
 The \fBia-pd\fR option is manufactured by clients and servers to create a
-Prefix Delegation binding - to delegate an IPv6 prefix to the client.  There
-is not yet any support for prefix delegation in this software, and this
-option is provided informationally only.
+Prefix Delegation binding - to delegate an IPv6 prefix to the client.  It is
+not directly edited in dhcpd.conf(5) or dhclient.conf(5), but rather is
+manufactured and consumed by the software.
 .RE
 .PP
 .B option \fBdhcp6.ia-prefix\fR \fIstring\fR\fB;\fR
 .RS 0.25i
 .PP
 The \fBia-prefix\fR option is placed inside \fBia-pd\fR options in order
-to identify the prefix(es) allocated to the client.  There is not yet
-any suport for prefix delegation in this software, and this option is
-provided informationally only.
+to identify the prefix(es) allocated to the client.  It is not directly
+edited in dhcpd.conf(5) or dhclient.conf(5), but rather is  
+manufactured and consumed by the software.
 .RE
 .PP
 .B option