[#2898] addressed comments

diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json
index 27e87fcd35b8c77b85c347a868c702861ffebbb4..022eb0f21429f544fe965b9844e3144a46f86ee3 100644 (file)
--- a/doc/examples/kea4/all-keys-netconf.json
+++ b/doc/examples/kea4/all-keys-netconf.json
@@ -995,7 +995,7 @@
                                 // The pool ID does not need to be unique within the subnet
                                 // or across subnets.
                                 // If not unconfigured, it defaults to 0. The statistics
-                                // regarding this pool will be merged with the other statistics
+                                // regarding this pool will be combined with the other statistics
                                 // of all other pools with the same pool ID in this subnet.
                                 "pool-id": 1
                             }

diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json
index eb9926cdca921a1950524d861c8f348dc6336246..ca06d65390c5512135d97436469d0190bc6fe0f1 100644 (file)
--- a/doc/examples/kea4/all-keys.json
+++ b/doc/examples/kea4/all-keys.json
@@ -995,7 +995,7 @@
                                 // The pool ID does not need to be unique within the subnet
                                 // or across subnets.
                                 // If not unconfigured, it defaults to 0. The statistics
-                                // regarding this pool will be merged with the other statistics
+                                // regarding this pool will be combined with the other statistics
                                 // of all other pools with the same pool ID in this subnet.
                                 "pool-id": 1
                             }

diff --git a/doc/examples/kea6/all-keys-netconf.json b/doc/examples/kea6/all-keys-netconf.json
index 768956de94ffd1492eca23575394c4a0df02ab50..4d8a1b04a877366ead9920d654e5f8395b157706 100644 (file)
--- a/doc/examples/kea6/all-keys-netconf.json
+++ b/doc/examples/kea6/all-keys-netconf.json
@@ -955,7 +955,7 @@
                                 // The pool ID does not need to be unique within the subnet
                                 // or across subnets.
                                 // If not unconfigured, it defaults to 0. The statistics
-                                // regarding this pool will be merged with the other statistics
+                                // regarding this pool will be combined with the other statistics
                                 // of all other pools with the same pool ID in this subnet.
                                 "pool-id": 1
                             }

diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json
index ea1768b999cefd20133710bc1096d5355de04d1f..5b8288d6aca403c19a61c4e9dd6b494476efc4d7 100644 (file)
--- a/doc/examples/kea6/all-keys.json
+++ b/doc/examples/kea6/all-keys.json
@@ -955,7 +955,7 @@
                                 // The pool ID does not need to be unique within the subnet
                                 // or across subnets.
                                 // If not unconfigured, it defaults to 0. The statistics
-                                // regarding this pool will be merged with the other statistics
+                                // regarding this pool will be combined with the other statistics
                                 // of all other pools with the same pool ID in this subnet.
                                 "pool-id": 1
                             }

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 1bb91d4cc953278b6d986c79264798cfbd77e093..5b2d94daa972f228ed4fa822b2f0883c62c5bef4 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -7262,7 +7262,7 @@ The DHCPv4 server supports the following statistics:
    The statistics related to pool ID 0 refer to all the statistics of all the pools
    that have unconfigured ``pool-id``.
    The pool ID does not need to be unique within the subnet or across subnets.
-   The statistics regarding a specific pool ID within a subnet will be merged with the
+   The statistics regarding a specific pool ID within a subnet will be combined with the
    other statistics of all other pools with the same pool ID in the respective subnet.
 
 .. note::

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 47ee79eb829b082ac4f13eb7d87fd00fa22ce836..ac635ce6c03951299bfedf4a5885db84606bdf0b 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -7063,7 +7063,7 @@ The DHCPv6 server supports the following statistics:
    The statistics related to pool ID 0 refer to all the statistics of all the pools
    that have unconfigured ``pool-id``.
    The pool ID does not need to be unique within the subnet or across subnets.
-   The statistics regarding a specific pool ID within a subnet will be merged with the
+   The statistics regarding a specific pool ID within a subnet will be combined with the
    other statistics of all other pools with the same pool ID in the respective subnet.
 
 .. note::