From db4de1acaea45a97f5151dfec0b38004ec2901ad Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Wed, 21 Jun 2023 23:52:29 +0300 Subject: [PATCH] [#2898] addressed comments --- doc/examples/kea4/all-keys-netconf.json | 2 +- doc/examples/kea4/all-keys.json | 2 +- doc/examples/kea6/all-keys-netconf.json | 2 +- doc/examples/kea6/all-keys.json | 2 +- doc/sphinx/arm/dhcp4-srv.rst | 2 +- doc/sphinx/arm/dhcp6-srv.rst | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/examples/kea4/all-keys-netconf.json b/doc/examples/kea4/all-keys-netconf.json index 27e87fcd35..022eb0f214 100644 --- 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 eb9926cdca..ca06d65390 100644 --- 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 768956de94..4d8a1b04a8 100644 --- 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 ea1768b999..5b8288d6ac 100644 --- 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 1bb91d4cc9..5b2d94daa9 100644 --- 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 47ee79eb82..ac635ce6c0 100644 --- 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:: -- 2.47.2