From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 18 Jul 2019 10:36:18 +0000 (+0200)
Subject: [#644,!370] Manual apply of 0a5979369902070ee0c4faf3b713627455b99489 to rst
X-Git-Tag: Kea-1.6.1~10^2~73
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6e6f2b9b90d3730ea5519e9d6a39eacbdfebec98;p=thirdparty%2Fkea.git

[#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 b0fcb20321..b91c99b2a6 100644
--- 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 037bc455a5..4ad3c9d250 100644
--- 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