[5046] Pickup Francis' changes

doc/guide/dhcp4-srv.xml

@@ -3674,7 +3674,7 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
          it supports the following statistics related commands:
         <itemizedlist>
             <listitem>statistic-get</listitem>
-            <listitem> statistic-reset</listitem>
+            <listitem>statistic-reset</listitem>
             <listitem>statistic-remove</listitem>
             <listitem>statistic-get-all</listitem>
             <listitem>statistic-reset-all</listitem>

doc/guide/dhcp6-srv.xml

@@ -4078,7 +4078,7 @@ If not specified, the default value is:
          it supports the following statistics related commands:
         <itemizedlist>
             <listitem>statistic-get</listitem>
-            <listitem> statistic-reset</listitem>
+            <listitem>statistic-reset</listitem>
             <listitem>statistic-remove</listitem>
             <listitem>statistic-get-all</listitem>
             <listitem>statistic-reset-all</listitem>

src/bin/dhcp4/ctrl_dhcp4_srv.cc

@@ -63,7 +63,7 @@ ConstElementPtr
 ControlledDhcpv4Srv::commandConfigReloadHandler(const string&,
                                                 ConstElementPtr args) {
     // Use set-config as it handles logging and server config
-    return (commandSetConfigHandler("", args));
+    return (commandSetConfigHandler("set-config", args));
 }
 
 ConstElementPtr
@@ -100,7 +100,7 @@ ControlledDhcpv4Srv::commandSetConfigHandler(const string&,
     // configuration attempts.
     CfgMgr::instance().rollback();
 
-    // Logging is a sibling element and must be be parsed explicitly.
+    // Logging is a sibling element and must be parsed explicitly.
     // The call to configureLogger parses the given Logging element if
     // not null, into the staging config.  Note this does not alter the
     // current loggers, they remain in effect until we apply the

src/bin/dhcp6/ctrl_dhcp6_srv.cc

@@ -68,7 +68,7 @@ ControlledDhcpv6Srv::commandLibReloadHandler(const string&, ConstElementPtr) {
 ConstElementPtr
 ControlledDhcpv6Srv::commandConfigReloadHandler(const string&, ConstElementPtr args) {
     // Use set-config as it handles logging and server config
-    return (commandSetConfigHandler("", args));
+    return (commandSetConfigHandler("set-config", args));
 }
 
 ConstElementPtr
@@ -105,7 +105,7 @@ ControlledDhcpv6Srv::commandSetConfigHandler(const string&,
     // configuration attempts.
     CfgMgr::instance().rollback();
 
-    // Logging is a sibling element and must be be parsed explicitly.
+    // Logging is a sibling element and must be parsed explicitly.
     // The call to configureLogger parses the given Logging element if
     // not null, into the staging config.  Note this does not alter the
     // current loggers, they remain in effect until we apply the