[#644,!370] Manual apply of 0a5979369902070ee0c4faf3b713627455b99489 to rst

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index b0fcb2032117c135f5cc1dde4bb8adffd711de0f..b91c99b2a6074e7f35a28966c8becc032c4c588e 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -3146,6 +3146,14 @@ qualifying suffix (if one is defined and needed).
    yield an empty domain label within a name, if that label consists
    only of invalid characters.
 
+.. note::
+
+   Since the 1.6.0 Kea release it is possible to specify hostname-char-set
+   and/or hostname-char-replacement at the global scope. This allows
+   to sanitize host names without requiring a dhcp-ddns entry. When
+   a hostname-char parameter is defined at the global scope and
+   in a dhcp-ddns entry the second (local) value is used.
+
 .. _dhcp4-next-server:
 
 Next Server (siaddr)

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 037bc455a55ce07b0c8e9a60b10fef80a6e8a4cf..4ad3c9d2505e2d74bd63b34c0c2c9be1cba14b0d 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -2898,6 +2898,14 @@ qualifying suffix (if one is defined and needed).
    yield an empty domain label within a name, if that label consists
    only of invalid characters.
 
+.. note::
+
+   Since the 1.6.0 Kea release it is possible to specify hostname-char-set
+   and/or hostname-char-replacement at the global scope. This allows
+   to sanitize host names without requiring a dhcp-ddns entry. When
+   a hostname-char parameter is defined at the global scope and
+   in a dhcp-ddns entry the second (local) value is used.
+
 .. _dhcp6-dhcp4o6-config:
 
 DHCPv4-over-DHCPv6: DHCPv6 Side