[#2745] Applied proposed changes

diff --git a/ChangeLog b/ChangeLog
index bfe691f1ddb9145a080ca166eadf08763a9783aa..0d40e0d0cd18ab1fabb71a428f2d3502224b366f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2161.  [doc]           fdupont
+       Clarified how Kea treats situations where there are multiple
+       reservations for the same host.
+       (Gitlab #2745)
+
 2160.  [doc]           tomek
        Added clarification about RFC3046 (Relay agent option) support,
        with some examples how to use its content.

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 50aaf6884277b5776be65c329f5cb422dacb172b..296b9e11bd02cc03face0968e2a9d489eac0bb46 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -5542,8 +5542,12 @@ If not specified, the default value is:
 
    As soon as a host reservation is found the search is stopped so
    when a client has two host reservations using different enabled
-   identifier types the first is permanently returned and the second
-   ignored, i.e. this is a configuration mistake.
+   identifier types the first is always returned and the second
+   ignored. In other words, this is usually a a configuration mistake.
+   In rare cases when having two reservations for the same host makes sense,
+   you can control which of those will be used by ordering the list of
+   identifier types in `host-reservation-identifiers`.
+
 
 .. _global-reservations4:
 

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index c5a76dae557b30d8122fbb37cb05ecc80ff04177..5b12ed49ff800b8646a8778abc93983d2e445405 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -4771,8 +4771,12 @@ If not specified, the default value is:
 
    As soon as a host reservation is found the search is stopped so
    when a client has two host reservations using different enabled
-   identifier types the first is permanently returned and the second
-   ignored, i.e. this is a configuration mistake.
+   identifier types the first is always returned and the second
+   ignored. In other words, this is usually a a configuration mistake.
+   In rare cases when having two reservations for the same host makes sense,
+   you can control which of those will be used by ordering the list of
+   identifier types in `host-reservation-identifiers`.
+
 
 .. _global-reservations6: