From: David Hankins <dhankins@isc.org>
Date: Fri, 1 Apr 2005 23:41:26 +0000 (+0000)
Subject: Upon trying to back the www-server documentation down to the
X-Git-Tag: HEAD-MERGE-V3-0-3RC1_base
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13936722cae9a5a7cebbe92a4c9fff25fbe7450a;p=thirdparty%2Fdhcp.git

Upon trying to back the www-server documentation down to the
V3-release-branch, I now believe that this was a merge error...the option
is already documented, this duplicates it.  Probably confused cvs merging
somehow from the fact that a single word was added...
---

diff --git a/RELNOTES b/RELNOTES
index fc46463ed..4eb1fc04b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -60,10 +60,6 @@ and for prodding me into improving it.
 - 'make install' now creates the initial zero-length dhcpd.leases file if
   one does not already exist on the system.
 
-X The 'www-server' option was documented.  This should probably be
-  backported to V3-RELEASE-BRANCH.
-
-
 			Changes since 3.0.2
 
 - A bug was fixed where a server might load balance a DHCP REQUEST to its
diff --git a/common/dhcp-options.5 b/common/dhcp-options.5
index 25c003b3c..8728c6819 100644
--- a/common/dhcp-options.5
+++ b/common/dhcp-options.5
@@ -1,4 +1,4 @@
-.\"	$Id: dhcp-options.5,v 1.24 2005/03/17 20:14:57 dhankins Exp $
+.\"	$Id: dhcp-options.5,v 1.25 2005/04/01 23:41:26 dhankins Exp $
 .\"
 .\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
 .\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -27,9 +27,6 @@
 .\" ``http://www.isc.org/''.  To learn more about Vixie Enterprises,
 .\" see ``http://www.vix.com''.   To learn more about Nominum, Inc., see
 .\" ``http://www.nominum.com''.
-.\"
-.\" $Id: dhcp-options.5,v 1.24 2005/03/17 20:14:57 dhankins Exp $
-.\"
 .TH dhcpd-options 5
 .SH NAME
 dhcp-options - Dynamic Host Configuration Protocol options
@@ -1023,14 +1020,6 @@ The WWW server option specifies a list of WWW servers available
 to the client.  Servers should be listed in order of preference.
 .RE
 .PP
-.B option \fBwww-server\fR \fIip-address\fR [\fB,\fR
-\fIip-address\fR... ]\fB;\fR
-.RS 0.25i
-.PP
-The WWW server option specifies a list of WWW available to the
-client.  Servers should be listed in order of preference.
-.RE
-.PP
 .B option \fBx-display-manager\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...
 ]\fB;\fR
 .RS 0.25i