[#2959] addressed comments

diff --git a/ChangeLog b/ChangeLog
index 31b8a2b0bc13b80ff4b6d1aea071f8995671bf08..ec7e5ec3b3d2bbe55c55392246253ab55e6cb76f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2239.  [func]*         razvan
+       Removed deprecated parameter: "reservation-mode".
+       (Gitlab #2959)
+
 2238.  [func]*         razvan
        Removed the following deprecated parameters from "dhcp-ddns"
        global element: "generated-prefix", "qualifying-suffix",

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 209fb3dbe1b584c4a7955ae0d1db70aef7ac3936..446331de3c134652ac5a0578d4dc4eb987b8f1bf 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -5324,32 +5324,32 @@ allocating or renewing a lease for the client.
 
 Configuration flags are:
 
--  ``reservations-in-subnet`` - when set to true, it enables in-pool host
+-  ``reservations-in-subnet`` - when set to ``true``, it enables in-pool host
    reservation types. This setting is the default value, and is the safest and
    most flexible. However, as all checks are conducted, it is also the slowest.
-   It does not check against global reservations. This flag defaults to true.
+   It does not check against global reservations. This flag defaults to ``true``.
 
--  ``reservations-out-of-pool`` - when set to true, it allows only out-of-pool
+-  ``reservations-out-of-pool`` - when set to ``true``, it allows only out-of-pool
    host reservations. In this case the server assumes that all host reservations
    are for addresses that do not belong to the dynamic pool. Therefore, it can
    skip the reservation checks when dealing with in-pool addresses, thus
    improving performance. Do not use this mode if any reservations use in-pool
    addresses. Caution is advised when using this setting; Kea does not
    sanity-check the reservations against ``reservations-out-of-pool`` and
-   misconfiguration may cause problems. This flag defaults to false.
+   misconfiguration may cause problems. This flag defaults to ``false``.
 
 -  ``reservations-global`` - allows global host reservations. With this setting
    in place, the server searches for reservations for a client among the defined
    global reservations. If an address is specified, the server skips the
    reservation checks carried out in other modes, thus improving performance.
    Caution is advised when using this setting; Kea does not sanity-check the
-   reservations when ``reservations-global`` is set, and misconfiguration may
-   cause problems. This flag defaults to  false.
+   reservations when ``reservations-global`` is set to ``true``, and
+   misconfiguration may cause problems. This flag defaults to ``false``.
 
-Note: disabling all flags disables host reservation support. As there are no
-   reservations, the server skips all checks. Any reservations defined are
-   completely ignored. As checks are skipped, the server may operate faster in
-   this mode.
+Note: setting all flags to ``false`` disables host reservation support.
+   As there are no reservations, the server skips all checks. Any reservations
+   defined are completely ignored. As checks are skipped, the server may operate
+   faster in this mode.
 
 Since Kea 1.9.1 the ``reservations-global``, ``reservations-in-subnet`` and
 ``reservations-out-of-pool`` flags are suported.

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 139d55a070cfb28033454b00f08beae4aba06964..5deec176813eba03fc334a7c593d992a127f057d 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -4622,32 +4622,32 @@ allocating or renewing a lease for the client.
 
 Configuration flags are:
 
--  ``reservations-in-subnet`` - when set to true, it enables in-pool host
+-  ``reservations-in-subnet`` - when set to ``true``, it enables in-pool host
    reservation types. This setting is the default value, and is the safest and
    most flexible. However, as all checks are conducted, it is also the slowest.
-   It does not check against global reservations. This flag defaults to true.
+   It does not check against global reservations. This flag defaults to ``true``.
 
--  ``reservations-out-of-pool`` - when set to true, it allows only out-of-pool
+-  ``reservations-out-of-pool`` - when set to ``true``, it allows only out-of-pool
    host reservations. In this case the server assumes that all host reservations
    are for addresses that do not belong to the dynamic pool. Therefore, it can
    skip the reservation checks when dealing with in-pool addresses, thus
    improving performance. Do not use this mode if any reservations use in-pool
    addresses. Caution is advised when using this setting; Kea does not
    sanity-check the reservations against ``reservations-out-of-pool`` and
-   misconfiguration may cause problems. This flag defaults to false.
+   misconfiguration may cause problems. This flag defaults to ``false``.
 
 -  ``reservations-global`` - allows global host reservations. With this setting
    in place, the server searches for reservations for a client among the defined
    global reservations. If an address is specified, the server skips the
    reservation checks carried out in other modes, thus improving performance.
    Caution is advised when using this setting; Kea does not sanity-check the
-   reservations when ``reservations-global`` is set, and misconfiguration may
-   cause problems. This flag defaults to false.
+   reservations when ``reservations-global`` is set to ``true``, and
+   misconfiguration may cause problems. This flag defaults to ``false``.
 
-Note: disabling all flags disables host reservation support. As there are no
-   reservations, the server skips all checks. Any reservations defined are
-   completely ignored. As checks are skipped, the server may operate faster in
-   this mode.
+Note: setting all flags to ``false`` disables host reservation support.
+   As there are no reservations, the server skips all checks. Any reservations
+   defined are completely ignored. As checks are skipped, the server may operate
+   faster in this mode.
 
 Since Kea 1.9.1 the ``reservations-global``, ``reservations-in-subnet`` and
 ``reservations-out-of-pool`` flags are suported.