[#916] Addressed comments

diff --git a/doc/sphinx/arm/config.rst b/doc/sphinx/arm/config.rst
index 1c76a9e04c24a5e9fe4aa13a55cb08271d5fa2a5..a430044ebbbe28544d303c7013a150be643c2235 100644 (file)
--- a/doc/sphinx/arm/config.rst
+++ b/doc/sphinx/arm/config.rst
@@ -107,8 +107,8 @@ To avoid repetition of mostly similar structures, examples in the rest
 of this guide will showcase only the subset of parameters appropriate
 for a given context. For example, when discussing the IPv6 subnets
 configuration in DHCPv6, only subnet6 parameters will be mentioned. It
-is implied that the remaining elements (the global map that holds Dhcp6
-and Logging) are present, but they are omitted for clarity. Usually,
+is implied that the remaining elements (the global map that holds Dhcp6)
+are present, but they are omitted for clarity. Usually,
 locations where extra parameters may appear are denoted by an ellipsis
 (...).
 

diff --git a/src/bin/dhcp6/parser_context.h b/src/bin/dhcp6/parser_context.h
index 6175648966409dcae29ea2d87c5d91f9bfad245d..790a96dd5727ab18009bcd45a4ec437a9ae90ded 100644 (file)
--- a/src/bin/dhcp6/parser_context.h
+++ b/src/bin/dhcp6/parser_context.h
@@ -192,7 +192,7 @@ public:
     ///
     /// @param name name of the parameter expected to be present
     /// @param open_loc location of the opening curly bracket
-    /// @param close_loc ocation of the closing curly bracket
+    /// @param close_loc location of the closing curly bracket
     /// @throw Dhcp6ParseError
     void require(const std::string& name,
                  isc::data::Element::Position open_loc,

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index 010e00a121d05ca34c822eec478f6799249771b1..20ce9080f5704204d6c62399f771e67f7fbbb8d2 100644 (file)
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -683,8 +683,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) {
         "            \"output_options\": [{ \n"
         "                \"output\": \"/dev/null\" \n"
         "            }] \n"
-        "        }] \n"
-        "    } \n";
+        "        }] \n";
 
     std::ostringstream os;
 
@@ -730,7 +729,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configSet) {
         << socket_path_
         << control_socket_footer
         << "}\n"                      // close dhcp6
-        "}}";
+        << "}}";
 
     // Send the config-set command
     sendUnixCommand(os.str(), response);
@@ -859,8 +858,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
         "            \"output_options\": [{ \n"
         "                \"output\": \"/dev/null\" \n"
         "            }] \n"
-        "        }] \n"
-        "    } \n";
+        "        }] \n";
 
     std::ostringstream os;
 
@@ -901,7 +899,7 @@ TEST_F(CtrlChannelDhcpv6SrvTest, configTest) {
         << socket_path_
         << control_socket_footer
         << "}\n"                      // close dhcp6
-        "}}";
+        << "}}";
 
     // Send the config-test command
     sendUnixCommand(os.str(), response);

diff --git a/src/bin/netconf/parser_context.h b/src/bin/netconf/parser_context.h
index c1ac1f897bca2c5f634eb3e51c386e2dd0e61dbb..edab8d64387009f4da8187bb6489c8deba29b964 100644 (file)
--- a/src/bin/netconf/parser_context.h
+++ b/src/bin/netconf/parser_context.h
@@ -155,7 +155,7 @@ public:
     ///
     /// @param name name of the parameter to check
     /// @param open_loc location of the opening curly bracket
-    /// @param close_loc ocation of the closing curly bracket
+    /// @param close_loc location of the closing curly bracket
     /// @throw ParseError
     void require(const std::string& name,
                  isc::data::Element::Position open_loc,