diff options
| author | David Hankins <dhankins@isc.org> | 2005-04-01 23:41:26 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2005-04-01 23:41:26 +0000 |
| commit | 13936722cae9a5a7cebbe92a4c9fff25fbe7450a (patch) | |
| tree | c178d6a96f5df2bf70c976b8c1f3efb08f4d4ca9 /common/dhcp-options.5 | |
| parent | 9748a78039d741f844f0db04d4f2100fa1050496 (diff) | |
| download | isc-dhcp-13936722cae9a5a7cebbe92a4c9fff25fbe7450a.tar.gz | |
Upon trying to back the www-server documentation down to theHEAD-MERGE-V3-0-3RC1_base
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...
Diffstat (limited to 'common/dhcp-options.5')
| -rw-r--r-- | common/dhcp-options.5 | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/common/dhcp-options.5 b/common/dhcp-options.5 index 25c003b3..8728c681 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 |