[#413,!288] More review comments.

diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h
index 61c1aec044da383a5fb85f561b990d423d92a57b..3d957ea723e3891ace1fa21f964ee7ece0fd9e7c 100644 (file)
--- a/src/lib/dhcpsrv/srv_config.h
+++ b/src/lib/dhcpsrv/srv_config.h
@@ -507,10 +507,14 @@ public:
     /// The @c other parameter must be a @c SrvConfig or its derivation.
     ///
     /// This method calls either @c merge4 or @c merge6 based on
-    /// @c CfgMgr::family_.
     ///
     /// Currently, the following parts of the configuration are merged:
-    /// - IPv4 subnets
+    /// - globals
+    /// - option definitions
+    /// - options
+    /// - via @c merge4 or @c merge6 depending on @c CfgMgr::family_:
+    ///     - shared networks
+    ///     - subnets
     ///
     /// @todo Add support for merging other configuration elements.
     ///

diff --git a/src/lib/dhcpsrv/tests/srv_config_unittest.cc b/src/lib/dhcpsrv/tests/srv_config_unittest.cc
index 0e81acfa9b20d72d3a4c68cb5c27c6feebc2ca86..cdafcd5a416cd75937a3ab2e37a62961fa613d0b 100644 (file)
--- a/src/lib/dhcpsrv/tests/srv_config_unittest.cc
+++ b/src/lib/dhcpsrv/tests/srv_config_unittest.cc
@@ -1046,7 +1046,7 @@ TEST_F(SrvConfigTest, mergeGlobals4) {
 // This test verifies that globals from one SrvConfig
 // can be merged into another. It verifies that values
 // in the from-config override those in to-config which
-// override those in GLOBAL4_DEFAULTS.
+// override those in GLOBAL6_DEFAULTS.
 TEST_F(SrvConfigTest, mergeGlobals6) {
     // Set the family we're working with.
     CfgMgr::instance().setFamily(AF_INET6);