From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 25 Mar 2019 17:35:25 +0000 (+0100)
Subject: [#103,!277] Addressed minor review comments.
X-Git-Tag: Kea-1.6.0-beta~315
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efd70f451dfaac4d5ba0d05014743ebb20cf8ef3;p=thirdparty%2Fkea.git

[#103,!277] Addressed minor review comments.
---

diff --git a/src/lib/dhcpsrv/cb_ctl_dhcp4.h b/src/lib/dhcpsrv/cb_ctl_dhcp4.h
index bc5d9ccf70..8e387277e4 100644
--- a/src/lib/dhcpsrv/cb_ctl_dhcp4.h
+++ b/src/lib/dhcpsrv/cb_ctl_dhcp4.h
@@ -26,8 +26,8 @@ namespace dhcp {
 class CBControlDHCPv4 : public CBControlDHCP<ConfigBackendDHCPv4Mgr> {
 protected:
 
-    /// @brief DHCPv4 server specific method to apply fetch configuration
-    /// into the local configuration.
+    /// @brief DHCPv4 server specific method to fetch and apply back end
+    /// configuration into the local configuration.
     ///
     /// @param backend_selector Backend selector.
     /// @param server_selector Server selector.
diff --git a/src/lib/process/cb_ctl_base.h b/src/lib/process/cb_ctl_base.h
index ad4daec206..d50a5f84f0 100644
--- a/src/lib/process/cb_ctl_base.h
+++ b/src/lib/process/cb_ctl_base.h
@@ -31,8 +31,8 @@ namespace process {
 /// has to be merged.
 ///
 /// When the server starts up, the existing configuration is the one that
-/// the server read from the configuration file. Usually, the configuration
-/// fetched from the file will be disjoint with the configuration in the
+/// the server reads from the configuration file. Usually, the configuration
+/// fetched from the file will be disjointed with the configuration in the
 /// database, e.g. all subnets should be specified either in the configuration
 /// file or a database, not in both. However, there may be other cases when
 /// option definitions are held in the configuration file, but the DHCP
@@ -43,7 +43,7 @@ namespace process {
 /// database. Finally, both configurations should be merged and committed
 /// if they are deemed sane.
 ///
-/// When the server is already running it uses "audit" (a.k.a. journal)
+/// When the server is already running it may use "audit" (a.k.a. journal)
 /// to periodically check if there are any pending configuration updates.
 /// If changes are present, it will be fetched and used to create a new
 /// configuration object (derived from the @c ConfigBase) holding this
@@ -63,7 +63,7 @@ namespace process {
 ///   databases via the configuration backends,
 /// - fetch the audit trail to detect configuration updates,
 /// - store the timestamp of the most recent audit entry fetched from the
-///   database, so as next time it can only fetch the later updates.
+///   database, so as next time it can fetch only the later updates.
 ///
 /// The server specific part to be implemented in derived classes must
 /// correctly interpret the audit entries and make appropriate API calls
@@ -260,8 +260,8 @@ protected:
         return (true);
     }
 
-    /// @brief Server specific method to apply fetched configuration into
-    /// the local configuration.
+    /// @brief Server specific method to fetch and apply back end
+    /// configuration into the local configuration.
     ///
     /// This pure virtual method must be implemented in the derived classes
     /// to provide server specific implementation of fetching and applying
diff --git a/src/lib/process/process_messages.mes b/src/lib/process/process_messages.mes
index 13593a41f2..78b16c2e5c 100644
--- a/src/lib/process/process_messages.mes
+++ b/src/lib/process/process_messages.mes
@@ -50,7 +50,7 @@ configuration is committed by the administrator.  Additional information
 may be provided.
 
 % DCTL_CONFIG_FETCH Fetching configuration data from config backends.
-This is an informational message emitted when the Kea server about to begin
+This is an informational message emitted when the Kea server is about to begin
 retrieving configuration data from one or more configuration backends.
 
 % DCTL_CONFIG_FILE_LOAD_FAIL %1 reason: %2
diff --git a/src/lib/process/tests/cb_ctl_base_unittests.cc b/src/lib/process/tests/cb_ctl_base_unittests.cc
index 6cd8c82ea7..bdaffba41a 100644
--- a/src/lib/process/tests/cb_ctl_base_unittests.cc
+++ b/src/lib/process/tests/cb_ctl_base_unittests.cc
@@ -387,7 +387,7 @@ public:
     std::map<std::string, boost::posix_time::ptime> timestamps_;
 };
 
-// This test verifies that the correct instance of the Config
+// This test verifies that the same instance of the Config
 // Backend Manager is returned.
 TEST_F(CBControlBaseTest, getMgr) {
     auto mgr = cb_ctl_.getMgr();