[trac4308] Tidy up some typos and copyright statements

diff --git a/src/lib/dhcpsrv/cfg_subnets4.cc b/src/lib/dhcpsrv/cfg_subnets4.cc
index 72b0a614dfccf4f5bd53b35f5e8a32d6fbdbafb0..3a5a2977870379aa9e95be1673fea984b20a0f04 100644 (file)
--- a/src/lib/dhcpsrv/cfg_subnets4.cc
+++ b/src/lib/dhcpsrv/cfg_subnets4.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -210,7 +210,6 @@ CfgSubnets4::selectSubnet(const IOAddress& address,
         if ((*subnet)->clientSupported(client_classes)) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE, DHCPSRV_CFGMGR_SUBNET4_ADDR)
                 .arg((*subnet)->toText()).arg(address.toText());
-
             return (*subnet);
         }
     }
@@ -219,7 +218,6 @@ CfgSubnets4::selectSubnet(const IOAddress& address,
     return (Subnet4Ptr());
 }
 
-
 bool
 CfgSubnets4::isDuplicate(const Subnet4& subnet) const {
     for (Subnet4Collection::const_iterator subnet_it = subnets_.begin();

diff --git a/src/lib/dhcpsrv/cfg_subnets4.h b/src/lib/dhcpsrv/cfg_subnets4.h
index 8e9b7fa38963bca61c0207d5f47c334ffef70d54..f9f7f11c34ef8f37f141c637c70a8c4558082c51 100644 (file)
--- a/src/lib/dhcpsrv/cfg_subnets4.h
+++ b/src/lib/dhcpsrv/cfg_subnets4.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2014-2016 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -47,7 +47,7 @@ public:
         return (&subnets_);
     }
 
-    /// @brief Returns pointer to the selected subnet.
+    /// @brief Returns a pointer to the selected subnet.
     ///
     /// This method tries to retrieve the subnet for the client using various
     /// parameters extracted from the client's message using the following
@@ -96,7 +96,7 @@ public:
     /// or they are insufficient to select a subnet.
     Subnet4Ptr selectSubnet(const SubnetSelector& selector) const;
 
-    /// @brief Returns pointer to a subnet if provided address is in its range.
+    /// @brief Returns a pointer to a subnet if provided address is in its range.
     ///
     /// This method returns a pointer to the subnet if the address passed in
     /// parameter is in range with this subnet. This is mainly used for unit
@@ -120,12 +120,12 @@ public:
                             const ClientClasses& client_classes
                             = ClientClasses()) const;
 
-    /// @brief Returns pointer to a subnet if provided interface name matches.
+    /// @brief Returns a pointer to a subnet if provided interface name matches.
     ///
     /// This method returns a pointer to the subnet if the interface name passed
-    /// in parameter matches that of a subnet. This is mainly used for matching
+    /// in parameter iface matches that of a subnet. This is mainly used for matching
     /// local incoming traffic, even when the addresses on local interfaces do
-    /// not match subnet definition. This method is also called by the
+    /// not match a subnet definition. This method is also called by the
     /// @c selectSubnet(SubnetSelector).
     ///
     /// @todo This method requires performance improvement! It currently

diff --git a/src/lib/dhcpsrv/dhcpsrv_messages.mes b/src/lib/dhcpsrv/dhcpsrv_messages.mes
index 1a6647d55e812ad8ef47713502216e7ff8882f1e..ea76adaf9c7305c1a1137c9c033ed72ad2040f0d 100644 (file)
--- a/src/lib/dhcpsrv/dhcpsrv_messages.mes
+++ b/src/lib/dhcpsrv/dhcpsrv_messages.mes
@@ -102,24 +102,24 @@ This is a debug message reporting that the DHCP configuration manager has
 returned the specified IPv4 subnet when given the address hint specified
 as the address is within the subnet.
 
-% DHCPSRV_CFGMGR_SUBNET4_RELAY selected subnet %1, because of matching relay addr %2
-This is a debug message reporting that the DHCP configuration manager has
-returned the specified IPv4 subnet, because detected relay agent address
-matches value specified for this subnet.
-
 % DHCPSRV_CFGMGR_SUBNET4_ADDR selected subnet %1 for packet received by matching address %2
 This is a debug message reporting that the DHCP configuration manager
-has returned the specified IPv4 subnet for a packet received. This particular
-subnet was selected, because an IPv4 address was matched to belong to that
+has returned the specified IPv4 subnet for a received packet. This particular
+subnet was selected, because an IPv4 address was matched which belonged to that
 subnet.
 
 % DHCPSRV_CFGMGR_SUBNET4_IFACE selected subnet %1 for packet received over interface %2
 This is a debug message reporting that the DHCP configuration manager
 has returned the specified IPv4 subnet for a packet received over
-given interface.  This particular subnet was selected, because it
-was specified as being directly reachable over given interface. (see
+the given interface.  This particular subnet was selected, because it
+was specified as being directly reachable over the given interface. (see
 'interface' parameter in the subnet4 definition).
 
+% DHCPSRV_CFGMGR_SUBNET4_RELAY selected subnet %1, because of matching relay addr %2
+This is a debug message reporting that the DHCP configuration manager has
+returned the specified IPv4 subnet, because detected relay agent address
+matches value specified for this subnet.
+
 % DHCPSRV_CFGMGR_SUBNET6 retrieved subnet %1 for address hint %2
 This is a debug message reporting that the DHCP configuration manager has
 returned the specified IPv6 subnet when given the address hint specified