summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hankins <dhankins@isc.org>2007-04-19 21:35:33 +0000
committerDavid Hankins <dhankins@isc.org>2007-04-19 21:35:33 +0000
commit6c15c918bd5235249e0868cd5f19f06b2c043cee (patch)
tree30b42438e75d9043dfa0dfcf4278eb01fba2ab09
parent83f2d735b31d65887d9d56ef081716f21f8459b4 (diff)
downloadisc-dhcp-6c15c918bd5235249e0868cd5f19f06b2c043cee.tar.gz
- Several spelling typos were repaired, and some cross-references to other
relevant documents were included in the manpages, thanks to a patch by Andrew Pollock which got to us via Tomas Pospisek. [ISC-Bugs #16731]
-rw-r--r--RELNOTES4
-rw-r--r--client/dhclient.84
-rw-r--r--client/dhclient.conf.56
-rw-r--r--server/dhcpd.88
-rw-r--r--server/dhcpd.conf.58
5 files changed, 17 insertions, 13 deletions
diff --git a/RELNOTES b/RELNOTES
index dec5c498..02ffbc5e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -121,6 +121,10 @@ and for prodding me into improving it.
- A grammar error in the dhclient.8 manpage was repaired thanks to a patch
from Chris Wagner.
+- Several spelling typos were repaired, and some cross-references to other
+ relevant documents were included in the manpages, thanks to a patch
+ by Andrew Pollock which got to us via Tomas Pospisek.
+
Changes since 3.0.5rc1
- A bug was repaired in fixes to the dhclient which sought to run the
diff --git a/client/dhclient.8 b/client/dhclient.8
index 71bfb1d3..c6c31f1e 100644
--- a/client/dhclient.8
+++ b/client/dhclient.8
@@ -21,7 +21,7 @@
.\" <info@isc.org>
.\" http://www.isc.org/
.\"
-.\" $Id: dhclient.8,v 1.12.2.12 2007/04/19 21:19:25 dhankins Exp $
+.\" $Id: dhclient.8,v 1.12.2.13 2007/04/19 21:35:32 dhankins Exp $
.\"
.TH dhclient 8
.SH NAME
@@ -304,7 +304,7 @@ resume it, set its state attribute to 4.
.B DBDIR/dhclient.leases~.
.SH SEE ALSO
dhcpd(8), dhcrelay(8), dhclient-script(8), dhclient.conf(5),
-dhclient.leases(5).
+dhclient.leases(5), dhcp-eval(5).
.SH AUTHOR
.B dhclient(8)
has been written for Internet Systems Consortium
diff --git a/client/dhclient.conf.5 b/client/dhclient.conf.5
index c1ffa5fc..3b2c1c1e 100644
--- a/client/dhclient.conf.5
+++ b/client/dhclient.conf.5
@@ -1,4 +1,4 @@
-.\" $Id: dhclient.conf.5,v 1.12.2.12 2005/06/16 19:40:13 dhankins Exp $
+.\" $Id: dhclient.conf.5,v 1.12.2.13 2007/04/19 21:35:32 dhankins Exp $
.\"
.\" Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
.\" Copyright (c) 1996-2003 by Internet Software Consortium
@@ -621,8 +621,8 @@ This is a very complicated dhclient.conf file - in general, yours
should be much simpler. In many cases, it's sufficient to just
create an empty dhclient.conf file - the defaults are usually fine.
.SH SEE ALSO
-dhcp-options(5), dhclient.leases(5), dhcpd(8), dhcpd.conf(5), RFC2132,
-RFC2131.
+dhcp-options(5), dhcp-eval(5), dhclient.leases(5), dhcpd(8), dhcpd.conf(5),
+RFC2132, RFC2131.
.SH AUTHOR
.B dhclient(8)
was written by Ted Lemon
diff --git a/server/dhcpd.8 b/server/dhcpd.8
index cce1e8bd..caba24b7 100644
--- a/server/dhcpd.8
+++ b/server/dhcpd.8
@@ -28,7 +28,7 @@
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
.\"
-.\" $Id: dhcpd.8,v 1.18.2.13 2006/07/13 17:29:34 dhankins Exp $
+.\" $Id: dhcpd.8,v 1.18.2.14 2007/04/19 21:35:33 dhankins Exp $
.\"
.TH dhcpd 8
.SH NAME
@@ -435,7 +435,7 @@ currently supported).
.PP
.B pool \fIhandle\fR examine
.RS 0.5i
-the pool object associted with this lease (the pool object is not
+the pool object associated with this lease (the pool object is not
currently supported).
.RE
.PP
@@ -479,7 +479,7 @@ otherwise is simply the value supplied by the peer.
.B atsfp \fItime\fR examine
.RS 0.5i
the actual tsfp value sent from the peer. This value is forgotten when a
-lease binding state change is made, to facillitate retransmission logic.
+lease binding state change is made, to facilitate retransmission logic.
.RE
.PP
.B cltt \fItime\fR examine
@@ -579,7 +579,7 @@ resynchronize with its peer.
.PP
On shutdown the server will also attempt to cleanly shut down all
OMAPI connections. If these connections do not go down cleanly after
-five seconds, they are shut down pre-emptively. It can take as much
+five seconds, they are shut down preemptively. It can take as much
as 25 seconds from the beginning of the shutdown process to the time
that the server actually exits.
.PP
diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index 00039a78..9199887e 100644
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -28,7 +28,7 @@
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
.\"
-.\" $Id: dhcpd.conf.5,v 1.63.2.30 2006/07/09 15:02:24 dhankins Exp $
+.\" $Id: dhcpd.conf.5,v 1.63.2.31 2007/04/19 21:35:33 dhankins Exp $
.\"
.TH dhcpd.conf 5
.SH NAME
@@ -1508,7 +1508,7 @@ that client will not be able to get an address from the DHCP server.
\fBdeny duplicates;\fR
.PP
Host declarations can match client messages based on the DHCP Client
-Identifer option or based on the client's network hardware type and
+Identifier option or based on the client's network hardware type and
MAC address. If the MAC address is used, the host declaration will
match any client with that MAC address - even clients with different
client identifiers. This doesn't normally happen, but is possible
@@ -1842,7 +1842,7 @@ statement
The \fIdynamic-bootp-lease-cutoff\fR statement sets the ending time
for all leases assigned dynamically to BOOTP clients. Because BOOTP
clients do not have any way of renewing leases, and don't know that
-their leases could expire, by default dhcpd assignes infinite leases
+their leases could expire, by default dhcpd assigns infinite leases
to all BOOTP clients. However, it may make sense in some situations
to set a cutoff date for all BOOTP leases - for example, the end of a
school term, or the time at night when a facility is closed and all
@@ -2216,7 +2216,7 @@ In the event that the UDP response is transmitted to a DHCP Relay, the
server generally uses the \fBlocal-port\fR configuration value. Should the
DHCP Relay happen to be addressed as 127.0.0.1, however, the DHCP Server
transmits its response to the \fBremote-port\fR configuration value. This
-is generally only useful for testing purposes, and this configuratoin value
+is generally only useful for testing purposes, and this configuration value
should generally not be used.
.RE
.PP