From: Jeremy C. Reed Date: Wed, 23 Mar 2016 13:01:42 +0000 (-0400) Subject: typo and spelling fixes in docs X-Git-Tag: v4_3_5b1~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dd0eb188765c5cdbbbcc388cbf8a33594ae74ff;p=thirdparty%2Fdhcp.git typo and spelling fixes in docs --- diff --git a/client/dhclient.8 b/client/dhclient.8 index 22505a395..cf073b4a8 100644 --- a/client/dhclient.8 +++ b/client/dhclient.8 @@ -246,7 +246,7 @@ types together or even to share the lease file between them. .BI \-4o6 \ port Participate in the DHCPv4 over DHCPv6 protocol specified by RFC 7341. This associates a DHCPv4 and a DHCPv6 client to allow the v4 client to -send v4 requests encapuslated in a v6 packet. Communication +send v4 requests encapsulated in a v6 packet. Communication between the two clients is done on a pair of UDP sockets bound to ::1 \fIport\fR and \fIport + 1\fR. Both clients must be launched using the same \fIport\fR argument. diff --git a/doc/DHCPv4-over-DHCPv6 b/doc/DHCPv4-over-DHCPv6 index cccc9c916..2d82a0573 100644 --- a/doc/DHCPv4-over-DHCPv6 +++ b/doc/DHCPv4-over-DHCPv6 @@ -25,9 +25,9 @@ The v6 client and server processes can continue to process DHCPv6 packets as normal but will also allow a DHCPv4 process to connect to them via a socket. The DHCPv4 client will pass a request to the DHCPv6 client which will encapsulate it within -a DHPCv6 request which is sent to the DHCPv6 server (possibly +a DHCPv6 request which is sent to the DHCPv6 server (possibly via DHCPv6 relays). When the DHCPv6 server receives the packet -it will get the DHPCv4 query and pass it to the DHCPv4 +it will get the DHCPv4 query and pass it to the DHCPv4 server. The response will by handled in a similar fashion. When starting up the paired processes one should take care that @@ -217,5 +217,5 @@ and that the configuration, lease and process id files should have different names. Again the The leases file (leases4) must be created before attempting to start the server. -Finally note in the configuration file the use of the shared-netowrk to +Finally note in the configuration file the use of the shared-network to connect the DHCPv4 and DHCPv6 subnets. diff --git a/server/dhcpd.8 b/server/dhcpd.8 index c097bcf06..c5a0a32a6 100644 --- a/server/dhcpd.8 +++ b/server/dhcpd.8 @@ -214,7 +214,7 @@ Run as a DHCPv6 server. This cannot be combined with \fB\-4\fR. .BI \-4o6 \ port Participate in the DHCPv4 over DHCPv6 protocol specified by RFC 7341. This associates a DHCPv4 and a DHCPv6 server to allow the v4 server to -receive v4 requests that were encapsualted in a v6 packet. Communication +receive v4 requests that were encapsulated in a v6 packet. Communication between the two servers is done on a pair of UDP sockets bound to ::1 \fIport\fR and \fIport + 1\fR. Both servers must be launched using the same \fIport\fR argument. @@ -349,9 +349,9 @@ and send most DHCPv4 packets. It also opens a fallback UDP socket for use in sending unicast packets. Normally these will both use the well known port number for BOOTPS. -For each DHCPv4 failover peer you list in the configuartion file +For each DHCPv4 failover peer you list in the configuration file there will be a TCP socket listening for connections on the -ports specififed in the configuration file. When the peer connects +ports specified in the configuration file. When the peer connects there will be another socket for the established connection. For the established connection the side (primary or secondary) opening the connection will use a random port. diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5 index a6b197767..9c99676d1 100644 --- a/server/dhcpd.conf.5 +++ b/server/dhcpd.conf.5 @@ -904,7 +904,7 @@ total number of clients within a particular class or subclass that may hold leases at one time, and it is possible to specify automatic subclassing based on the contents of the client packet. .PP -Classing support for DHCPv6 clients was addded in 4.3.0. It follows +Classing support for DHCPv6 clients was added in 4.3.0. It follows the same rules as for DHCPv4 except that support for billing classes has not been added yet. .PP @@ -1554,7 +1554,7 @@ statement may be specified matching the same client. .PP The .I fixed-address6 -delcaration is used for v6 addresses. At this time it only works with a single +declaration is used for v6 addresses. At this time it only works with a single address. For multiple addresses specify multiple .B host statements. @@ -2342,7 +2342,7 @@ If there are multiple prefixes for a given host entry the server will choose one that matches the requested prefix size or, if none match, the first one. .PP -If there are multiple \fIhost\fR delcarations the server will try to +If there are multiple \fIhost\fR declarations the server will try to choose a declaration where the \fIfixed-address6\fR matches the client's subnet. If none match it will choose one that doesn't have a \fIfixed-address6\fR statement.