mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 21:18:02 +00:00
Code Issues Releases Wiki Activity

[#2988] doc -version error fix

Browse Source
This commit is contained in:
Marcin Godzina 2023-07-20 07:13:39 +00:00
parent 976633c8a1
commit 0599ddc25a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/sphinx/arm/dhcp4-srv.rst
View File

@ -3530,7 +3530,7 @@ to add DNS entries or they were somehow lost by the DNS server.
The second parameter added in Kea 1.9.1 is ``ddns-use-conflict-resolution``. This The second parameter added in Kea 1.9.1 is ``ddns-use-conflict-resolution``. This
boolean parameter was passed through to D2 and enabled or disabled conflict resolution boolean parameter was passed through to D2 and enabled or disabled conflict resolution
as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__. Beginning with as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__. Beginning with
Kea 2.4.0, it is deprecated and replaced by ``ddns-conflict-resolution-mode`` which Kea 2.5.0, it is deprecated and replaced by ``ddns-conflict-resolution-mode`` which
offers four modes of conflict resolution-related behavior: offers four modes of conflict resolution-related behavior:
- ``check-with-dhcid`` - The default mode, it instructs D2 to carry out RFC - ``check-with-dhcid`` - The default mode, it instructs D2 to carry out RFC

2
doc/sphinx/arm/dhcp6-srv.rst
View File

@ -3123,7 +3123,7 @@ to add DNS entries or they were somehow lost by the DNS server.
The second parameter added in Kea 1.9.1 is ``ddns-use-conflict-resolution``. This The second parameter added in Kea 1.9.1 is ``ddns-use-conflict-resolution``. This
boolean parameter was passed through to D2 and enabled or disabled conflict resolution boolean parameter was passed through to D2 and enabled or disabled conflict resolution
as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__. Beginning with as described in `RFC 4703 <https://tools.ietf.org/html/rfc4703>`__. Beginning with
Kea 2.4.0, it is deprecated and replaced by ``ddns-conflict-resolution-mode`` which Kea 2.5.0, it is deprecated and replaced by ``ddns-conflict-resolution-mode`` which
offers four modes of conflict resolution-related behavior: offers four modes of conflict resolution-related behavior:
- ``check-with-dhcid`` - The default mode, it instructs D2 to carry out RFC - ``check-with-dhcid`` - The default mode, it instructs D2 to carry out RFC