[#2438] some outstanding minor corrections

diff --git a/src/lib/dhcpsrv/memfile_lease_storage.h b/src/lib/dhcpsrv/memfile_lease_storage.h
index 04ee5783d49629b5b2964f9149943e6e1f5e628b..0a3c5122b30a1b28f63b7c746902f5f84c59650e 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_storage.h
+++ b/src/lib/dhcpsrv/memfile_lease_storage.h
@@ -95,9 +95,9 @@ typedef boost::multi_index_container<
         // Specification of the third index starts here.
         boost::multi_index::ordered_non_unique<
             boost::multi_index::tag<ExpirationIndexTag>,
-            // This is a composite index that will be used to search for
+            // This is a composite index that is used to search for
             // the expired leases. Depending on the value of the first component
-            // of the search key, the reclaimed or not reclaimed leases will can
+            // of the search key, the reclaimed or not reclaimed leases can
             // be searched.
             boost::multi_index::composite_key<
                 Lease6,

diff --git a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
index 3eeda34c169b71c08d53549ff76add3e13944bb4..bc65b3b9707558d39a4f540a7205ca6059718314 100644 (file)
--- a/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cfgmgr_unittest.cc
@@ -299,7 +299,7 @@ public:
                                      "universe=6" : "universe=4");
             LeaseMgrFactory::create(s.str());
         } catch (const std::exception& ex) {
-            std::cerr << "*** ERROR: unable to create instance of the Memfile\n"
+            std::cerr << "*** ERROR: unable to create instance of the Memfile"
                 " lease database backend: " << ex.what() << std::endl;
             throw;
         }

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index c89d4de7c8053198b94de6000a0c074179707697..cf20726af2c83051f2aef775e929452dd5b2bc1a 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -210,7 +210,7 @@ public:
         try {
             LeaseMgrFactory::create(getConfigString(u));
         } catch (...) {
-            std::cerr << "*** ERROR: unable to create instance of the Memfile\n"
+            std::cerr << "*** ERROR: unable to create instance of the Memfile"
                 " lease database backend.\n";
             throw;
         }

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 19fa95a62872635ce4b521eac1e43ca71263391d..5b9040bcbe40295943bbfd7bac535d98166e48a3 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -3475,7 +3475,7 @@ DROP PROCEDURE IF EXISTS checkDHCPv4ClientClassKnownDependencyChange;
 -- -----------------------------------------------------------------------
 -- Stored procedure to be executed before committing a transaction
 -- updating a DHCPv4 client class. It verifies if the class dependency on
--- KNOWN or UNKNOWN built-in classes has changed as a a result of the
+-- KNOWN or UNKNOWN built-in classes has changed as a result of the
 -- update. It signals an error if it has changed and there is at least
 -- one class depending on this class.
 -- -----------------------------------------------------------------------
@@ -3935,7 +3935,7 @@ DROP PROCEDURE IF EXISTS checkDHCPv6ClientClassKnownDependencyChange;
 -- -----------------------------------------------------------------------
 -- Stored procedure to be executed before committing a transaction
 -- updating a DHCPv6 client class. It verifies if the class dependency on
--- KNOWN or UNKNOWN built-in classes has changed as a a result of the
+-- KNOWN or UNKNOWN built-in classes has changed as a result of the
 -- update. It signals an error if it has changed and there is at least
 -- one class depending on this class.
 -- -----------------------------------------------------------------------

diff --git a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
index 696d29a060857884698226012cfbe1339ee8aacf..94927ecce8bd5b89d1126e4328546941efdb365c 100644 (file)
--- a/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_009.6_to_010.0.sh.in
@@ -486,7 +486,7 @@ DROP PROCEDURE IF EXISTS checkDHCPv4ClientClassKnownDependencyChange;
 -- -----------------------------------------------------------------------
 -- Stored procedure to be executed before committing a transaction
 -- updating a DHCPv4 client class. It verifies if the class dependency on
--- KNOWN or UNKNOWN built-in classes has changed as a a result of the
+-- KNOWN or UNKNOWN built-in classes has changed as a result of the
 -- update. It signals an error if it has changed and there is at least
 -- one class depending on this class.
 -- -----------------------------------------------------------------------
@@ -946,7 +946,7 @@ DROP PROCEDURE IF EXISTS checkDHCPv6ClientClassKnownDependencyChange;
 -- -----------------------------------------------------------------------
 -- Stored procedure to be executed before committing a transaction
 -- updating a DHCPv6 client class. It verifies if the class dependency on
--- KNOWN or UNKNOWN built-in classes has changed as a a result of the
+-- KNOWN or UNKNOWN built-in classes has changed as a result of the
 -- update. It signals an error if it has changed and there is at least
 -- one class depending on this class.
 -- -----------------------------------------------------------------------