[#2974] minor changes

diff --git a/ChangeLog b/ChangeLog
index e22968997c742d5d00c3c42c5237be11cb1f31d5..1d2f7e38d34abf75bb2bfd6ce2339644f3e0cf5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
        Added three new API commands: subnet4-select-test and
        subnet4o6-select-test to kea-dhcp4, and subnet6-select-test
        to kea-dhcp6.  These commands can be used to check which
-       subnet the server will select based on given input paramters.
+       subnet the server will select based on given input parameters.
        (Gitlab #2794)
 
 2290.  [bug]           razvan

diff --git a/changelog_unreleased/2974-localize b/changelog_unreleased/2974-localize
deleted file mode 100644 (file)
index 75e03d4..0000000
--- a/changelog_unreleased/2974-localize
+++ /dev/null
@@ -1,5 +0,0 @@
-[func]         fdupont
-       Added new commands to simulate a subnet selection:
-       "localize4" and "localize4o6" for kea-dhcp4, and
-       "localize6" for kea-dhcp6.
-       (Gitlab #2974)

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 6d5e4763742b0091c344e40655250eddbcbb0b70..3079069287811b8a4175f6c96e4bf33c9ef76cea 100644 (file)
--- a/doc/sphinx/arm/ctrl-channel.rst
+++ b/doc/sphinx/arm/ctrl-channel.rst
@@ -917,7 +917,7 @@ packet. Recognized parameters take strings and are:
  -  ``classes`` - (list of strings) client classes (allowing to select a guarded subnet)
 
 According to the code only ``remote``, ``interface-id`` and ``interface``
-selectors are used. In DHCPv4-over-DHCPv6 implementation ``interface` and
+selectors are used. In DHCPv4-over-DHCPv6 implementation ``interface`` and
 ``remote`` values are transmitted from the DHCPv6 server, ``interface-id``
 and ``link`` are carried in the relay info part of the DHCPv6 packet so
 are the same as for the DHCPv6 server.

diff --git a/src/bin/dhcp4/ctrl_dhcp4_srv.h b/src/bin/dhcp4/ctrl_dhcp4_srv.h
index 5a845892db20f2fbf54a2487e8cfb1640384e643..31e78bed49135cb6c880938434168b9bf03733f6 100644 (file)
--- a/src/bin/dhcp4/ctrl_dhcp4_srv.h
+++ b/src/bin/dhcp4/ctrl_dhcp4_srv.h
@@ -303,7 +303,7 @@ private:
     /// @return status of the command with the selection result
     isc::data::ConstElementPtr
     commandSubnet4o6SelectTestHandler(const std::string& command,
-                              isc::data::ConstElementPtr args);
+                                      isc::data::ConstElementPtr args);
 
     /// @brief handler for server-tag-get command
     ///