[#1386] Addressed review comments for !976

doc/examples/kea4/all-keys.json
doc/examples/kea6/all-keys.json
doc/sphinx/arm/dhcp4-srv.rst
doc/sphinx/arm/dhcp6-srv.rst
src/lib/dhcpsrv/network.h
src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
    fixed typos

6 files changed, 8 insertions, 11 deletions

diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json
index 38dce67a61..fb714270c8 100644
--- a/doc/examples/kea4/all-keys.json
+++ b/doc/examples/kea4/all-keys.json
@@ -156,7 +156,7 @@
         "ddns-update-on-renew": true,
 
         // Boolean flag, which is passed to kea-dhcp-ddns with each DDNS
-        // udpate request to indicate whether or not DNS update conflict 
+        // update request to indicate whether or not DNS update conflict 
         // resolution as described in RFC 4703 should be employed for the
         // given update request.  The default value for this flag is true.  
         // It may be specified at the global, shared-network and subnet levels.
diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index 68b26a940d..b1725906ea 100644
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -116,7 +116,7 @@
         "ddns-update-on-renew": true,
 
         // Boolean flag, which is passed to kea-dhcp-ddns with each DDNS
-        // udpate request to indicate whether or not DNS update conflict 
+        // update request to indicate whether or not DNS update conflict 
         // resolution as described in RFC 4703 should be employed for the
         // given update request.  The default value for this flag is true.  
         // It may be specified at the global, shared-network and subnet levels.
diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 1b3e4fa058..3f9bb857d0 100644
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -3018,8 +3018,8 @@ to add DNS entries or they were somehow lost by the DNS server.
 
 The second parameter added in Kea 1.9.1 is ``ddns-use-conflict-resolution``.
 The value of this parameter is passed by kea-dhcp4 to D2 with each DNS update
-request.  When true, (the default value), D2 will employ conflict resolution
-,as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__, when
+request.  When true, (the default value), D2 will employ conflict resolution,
+as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__, when
 attempting to fulfill the update request.  When false, D2 will simply attempt
 to update the DNS entries per the request, regardless of whether or not they
 conflict with existing entries owned by other DHCP4 clients.
diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 22f050fb78..47ad3e5946 100644
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2693,8 +2693,8 @@ to add DNS entries or they were somehow lost by the DNS server.
 
 The second parameter added in Kea 1.9.1 is ``ddns-use-conflict-resolution``.
 The value of this parameter is passed by kea-dhcp6 to D2 with each DNS update
-request.  When true, (the default value), D2 will employ conflict resolution
-,as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__, when
+request.  When true, (the default value), D2 will employ conflict resolution,
+as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__, when
 attempting to fulfill the update request.  When false, D2 will simply attempt
 to update the DNS entries per the request, regardless of whether or not they
 conflict with existing entries owned by other DHCP6 clients.
diff --git a/src/lib/dhcpsrv/network.h b/src/lib/dhcpsrv/network.h
index b8c1e2feca..325b61e688 100644
--- a/src/lib/dhcpsrv/network.h
+++ b/src/lib/dhcpsrv/network.h
@@ -1070,7 +1070,7 @@ protected:
     /// @brief Should Kea perform updates when leases are extended 
     util::Optional<bool> ddns_update_on_renew_;
 
-    /// @brief Used to to tell kea-dhcp-ddns whehter or not to use conflict resolution.
+    /// @brief Used to to tell kea-dhcp-ddns whether or not to use conflict resolution.
     util::Optional<bool> ddns_use_conflict_resolution_;
 
     /// @brief Pointer to another network that this network belongs to.
diff --git a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
index 21ae13d38d..d60b9951e0 100644
--- a/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
@@ -327,7 +327,6 @@ public:
                           const SimpleDefaults& option_def_defaults) {
         size_t cnt = 0;
         // Set global defaults first.
-std::cout << "Calling setAllDefaults" << std::endl;
         cnt = SimpleParser::setDefaults(global, global_defaults);
 
         // Now set option definition defaults for each specified option definition
@@ -406,7 +405,6 @@ std::cout << "Calling setAllDefaults" << std::endl;
     /// non-zero otherwise failure.
     int parseConfiguration(const std::string& config, bool v6 = false,
                            bool set_defaults = true) {
-std::cout << "Calling parseConfiguration" << std::endl;
         int rcode_ = 1;
         // Turn config into elements.
         // Test json just to make sure its valid.
@@ -414,7 +412,6 @@ std::cout << "Calling parseConfiguration" << std::endl;
         EXPECT_TRUE(json);
         if (json) {
             if (set_defaults) {
-std::cout << "Calling setAllDefaults" << std::endl;
                 setAllDefaults(json, v6);
             }
 
@@ -2906,7 +2903,7 @@ TEST_F(ParseConfigTest, defaultSharedNetwork4) {
     ASSERT_TRUE(network);
 
     EXPECT_TRUE(network->hasFetchGlobalsFn());
-EXPECT_TRUE(network->getIface().unspecified());
+    EXPECT_TRUE(network->getIface().unspecified());
     EXPECT_TRUE(network->getIface().empty());
 
     EXPECT_TRUE(network->getClientClass().unspecified());