From: Francis Dupont <fdupont@isc.org>
Date: Thu, 11 Jul 2019 14:08:46 +0000 (+0200)
Subject: [712-cb_cmds-add-support-for-server-tags-in-the-shared-networks] Aligned on #717
X-Git-Tag: Kea-1.6.0-beta2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f745117fc6e0955ebf27f882a9f9eadafe6553;p=thirdparty%2Fkea.git

[712-cb_cmds-add-support-for-server-tags-in-the-shared-networks] Aligned on #717
---

diff --git a/src/lib/dhcpsrv/config_backend_dhcp4.h b/src/lib/dhcpsrv/config_backend_dhcp4.h
index bf09e154fd..c958274587 100644
--- a/src/lib/dhcpsrv/config_backend_dhcp4.h
+++ b/src/lib/dhcpsrv/config_backend_dhcp4.h
@@ -431,7 +431,7 @@ public:
     /// @brief Deletes subnet by prefix.
     ///
     /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: MULTIPLE.
+    /// Not allowed server selector: MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param subnet_prefix Prefix of the subnet to be deleted.
@@ -443,7 +443,7 @@ public:
     /// @brief Deletes subnet by identifier.
     ///
     /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: MULTIPLE.
+    /// Not allowed server selector: MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param subnet_id Identifier of the subnet to be deleted.
@@ -463,8 +463,8 @@ public:
 
     /// @brief Deletes all subnets belonging to a specified shared network.
     ///
-    /// Allowed server selectors: UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: ANY, MULTIPLE.
+    /// Allowed server selector: ANY.
+    /// Not allowed server selectors: UNASSIGNED, ALL, ONE, MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param shared_network_name Name of the shared network for which the
@@ -477,7 +477,7 @@ public:
     /// @brief Deletes shared network by name.
     ///
     /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: MULTIPLE.
+    /// Not allowed server selector: MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param name Name of the shared network to be deleted.
diff --git a/src/lib/dhcpsrv/config_backend_dhcp6.h b/src/lib/dhcpsrv/config_backend_dhcp6.h
index d0cc58a4fc..5f8ec3d1e9 100644
--- a/src/lib/dhcpsrv/config_backend_dhcp6.h
+++ b/src/lib/dhcpsrv/config_backend_dhcp6.h
@@ -262,7 +262,7 @@ public:
     /// @brief Retrieves global parameter value.
     ///
     /// Allowed server selectors: ALL, ONE.
-    /// Not allowed server selector: ANY, UNASSIGNED, MULTIPLE.
+    /// Not allowed server selectors: ANY, UNASSIGNED, MULTIPLE.
     ///
     /// @param selector Server selector.
     /// @param name Name of the global parameter to be retrieved.
@@ -449,7 +449,7 @@ public:
     /// @brief Deletes subnet by prefix.
     ///
     /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: MULTIPLE.
+    /// Not allowed server selector: MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param subnet_prefix Prefix of the subnet to be deleted.
@@ -461,7 +461,7 @@ public:
     /// @brief Deletes subnet by identifier.
     ///
     /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: MULTIPLE.
+    /// Not allowed server selector: MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param subnet_id Identifier of the subnet to be deleted.
@@ -481,8 +481,8 @@ public:
 
     /// @brief Deletes all subnets belonging to a specified shared network.
     ///
-    /// Allowed server selectors: UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: ANY, MULTIPLE.
+    /// Allowed server selector: ANY.
+    /// Not allowed server selectors: UNASSIGNED, ALL, ONE, MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param shared_network_name Name of the shared network for which the
@@ -495,7 +495,7 @@ public:
     /// @brief Deletes shared network by name.
     ///
     /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selectors: MULTIPLE.
+    /// Not allowed server selector: MULTIPLE.
     ///
     /// @param server_selector Server selector.
     /// @param name Name of the shared network to be deleted.
@@ -554,8 +554,8 @@ public:
 
     /// @brief Deletes shared network level option.
     ///
-    /// Allowed server selectors: ANY, UNASSIGNED, ALL, ONE.
-    /// Not allowed server selector: MULTIPLE.
+    /// Allowed server selector: ANY.
+    /// Not allowed server selectors: UNASSIGNED, ALL, ONE, MULTIPLE.
     ///
     /// @param selector Server selector.
     /// @param shared_network_name Name of the shared network which option