[3677] Fix typos/grammar in message files

src/bin/dhcp6/dhcp6_messages.mes

@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -91,7 +91,7 @@ to perform the DNS Update, which removes RRs from the DNS.
 This debug message is logged when FQDN mapping for a particular lease has
 been changed by the recent Request message. This mapping will be changed in DNS.
 
-% DHCP6_DDNS_LEASE_RENEW_FQDN_CHANGE FQDN for the renewed lease: %1 has changed new  values: hostname = %2, reverse mapping = %3, forward mapping = %4
+% DHCP6_DDNS_LEASE_RENEW_FQDN_CHANGE FQDN for the renewed lease: %1 has changed. New values: hostname = %2, reverse mapping = %3, forward mapping = %4
 This debug message is logged when FQDN mapping for a particular lease has been
 changed by the recent Renew message. This mapping will be changed in DNS.
 

src/lib/dhcpsrv/dhcpsrv_messages.mes

@@ -203,9 +203,9 @@ no lease4 should be assigned. The server will not put that lease in its
 database and the client will get a NAK packet.
 
 % DHCPSRV_HOOK_LEASE6_EXTEND_SKIP DHCPv6 lease lifetime was not extended because a callout set the skip flag for message %1
-or lease6_rebind hook point set the skip flag. For this particular hook
+or the lease6_rebind hook point set the skip flag. For this particular hook
 point, the setting of the flag by a callout instructs the server to not
-extend the lifetime for a lease. If client requested renewal of multiples
+extend the lifetime for a lease. If the client requested renewal of multiple
 leases (by sending multiple IA options), the server will skip the renewal
 of the one in question and will proceed with other renewals as usual.
 
@@ -215,33 +215,31 @@ hook point sets the skip flag. It means that the server was told that
 no lease6 should be assigned. The server will not put that lease in its
 database and the client will get a NoAddrsAvail for that IA_NA option.
 
-% DHCPSRV_HR_RESERVED_ADDR_GRANTED Reserved address %1 was was assigned to client (duid=%2)
-This informational message singals that there is a reservation for this client
-and this client got this specific address. This is normal operation for
-host reservation.
-
-% DHCPSRV_HR_RESERVED_PREFIX_GRANTED Reserved prefix %1/%2 was was assigned to client (duid=%3)
-This informational message singals that there is a reservation for this client
-and this client got this specific prefix. This is normal operation for
-host reservation.
-
-% DHCPSRV_HR_REVOKED_ADDR6_LEASE Address %1 was revoked from client %2 as it is reserved for client %3
-This informational message is an indication that the specified IPv6 address used
-to be used by client A, but it is now reserved for client B. As such, client
-A was told to stop using it, so it could be leased to client B. This is
-normal operation when doing conflict resolution, i.e. system administrator
-added reservation for an address that is currently in use by someone other
-than the reservation is for. The server will fully recover from this situation,
-but clients will experience address change.
+% DHCPSRV_HR_RESERVED_ADDR_GRANTED reserved address %1 was was assigned to client (duid=%2)
+This informational message signals that the specified client was assigned the address
+reserved for it.
+
+% DHCPSRV_HR_RESERVED_PREFIX_GRANTED reserved prefix %1/%2 was was assigned to client (duid=%3)
+This informational message signals that the specified client was assigned the prefix
+reserved for it.
+
+% DHCPSRV_HR_REVOKED_ADDR6_LEASE address %1 was revoked from client %2 as it is reserved for client %3
+This informational message is an indication that the specified IPv6
+address was used by client A but it is now reserved for client B. Client
+A has been told to stop using it so that it can be leased to client B.
+This is a normal occurrence during conflict resolution, which can occur
+in cases such as the system administrator adding a reservation for an
+address that is currently in use by another client.  The server will fully
+recover from this situation, but clients will change their addresses.
 
 % DHCPSRV_HR_REVOKED_PREFIX6_LEASE Prefix %1/%2 was revoked from client %3 as it is reserved for client %4
-This informational message is an indication that the specified IPv6 address used
-to be used by client A, but it is now reserved for client B. As such, client
-A was told to stop using it, so it could be leased to client B. This is
-normal operation when doing conflict resolution, i.e. system administrator
-added reservation for an address that is currently in use by someone other
-than the reservation is for. The server will fully recover from this situation,
-but clients will experience address change.
+This informational message is an indication that the specified IPv6
+prefix was used by client A but it is now reserved for client B. Client
+A has been told to stop using it so that it can be leased to client B.
+This is a normal occurrence during conflict resolution, which can occur
+in cases such as the system administrator adding a reservation for an
+address that is currently in use by another client.  The server will fully
+recover from this situation, but clients will change their prefixes.
 
 % DHCPSRV_INVALID_ACCESS invalid database access string: %1
 This is logged when an attempt has been made to parse a database access string
@@ -538,11 +536,11 @@ A debug message issued when the server is attempting to update IPv6
 lease from the PostgreSQL database for the specified address.
 
 % DHCPSRV_RENEW6_ERROR allocation engine experienced error with attempting to renew a lease: %1
-This error message indicates that an error was experienced during Renew or Rebind
-processing. Additional explanation is provided with this message. Depending
-on its nature, manual intervention may be required to continue processing
-messages from this particular client. The server will handle other clients
-normally.
+This error message indicates that an error was experienced during Renew
+or Rebind processing. Additional explanation is provided with this
+message. Depending on its nature, manual intervention may be required to
+continue processing messages from this particular client; other clients
+will be unaffected.
 
 % DHCPSRV_UNEXPECTED_NAME database access parameters passed through '%1', expected 'lease-database'
 The parameters for access the lease database were passed to the server through