From: Tomek Mrugalski <tomasz@isc.org>
Date: Thu, 18 Jul 2019 10:42:19 +0000 (+0200)
Subject: [#644,!370] Manual apply of 26b04d2d2d2a88be6abc5879a2fb48e05f0003fd
X-Git-Tag: Kea-1.6.1~10^2~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5acc2f02d1700f6348add42f89f6b55bd9a9ad;p=thirdparty%2Fkea.git

[#644,!370] Manual apply of 26b04d2d2d2a88be6abc5879a2fb48e05f0003fd
---

diff --git a/doc/sphinx/arm/classify.rst b/doc/sphinx/arm/classify.rst
index 244a037e9b..806fa0922f 100644
--- a/doc/sphinx/arm/classify.rst
+++ b/doc/sphinx/arm/classify.rst
@@ -603,7 +603,7 @@ hex string (which would indicate a DUID based on an enterprise id of
        "client-classes": [
            {
                "name": "Client_enterprise",
-               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD'",
+               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD",
                "option-data": [
                    {
                        "name": "dns-servers",
@@ -684,7 +684,7 @@ configuration will restrict use of the addresses 2001:db8:1::1 to
        "client-classes": [
            {
                "name": "Client_enterprise",
-               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD'",
+               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD",
                "option-data": [
                    {
                        "name": "dns-servers",
@@ -767,7 +767,7 @@ configuration will restrict use of the addresses 2001:db8:1::1 to
        "client-classes": [
            {
                "name": "Client_enterprise_",
-               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD'",
+               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD",
                "option-data": [
                    {
                        "name": "dns-servers",
diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 4ad3c9d250..b9d3472b04 100644
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -1025,7 +1025,7 @@ it is intended to be used on a link through which the delegating router
 exchanges DHCPv6 messages with the requesting router. The configuration
 example below demonstrates how to specify an excluded prefix within a
 prefix pool definition. The excluded prefix
-"2001:db8:1:babe:cafe:80::/72" will be sent to a requesting router which
+"2001:db8:1:8000:cafe:80::/72" will be sent to a requesting router which
 includes the Prefix Exclude option in the Option Request option (ORO),
 and which is delegated a prefix from this pool.
 
@@ -1040,7 +1040,7 @@ and which is delegated a prefix from this pool.
                        "prefix": "2001:db8:1:8000::",
                        "prefix-len": 48,
                        "delegated-len": 64,
-                       "excluded-prefix": "2001:db8:1:babe:cafe:80::",
+                       "excluded-prefix": "2001:db8:1:8000:cafe:80::",
                        "excluded-prefix-len": 72
                    }
                ]
@@ -2354,7 +2354,7 @@ servers set to 2001:db8:0::1 and 2001:db8:2::1.
        "client-classes": [
            {
                "name": "Client_enterprise",
-               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD'",
+               "test": "substring(option[1].hex,0,6) == 0x0002AABBCCDD",
                "option-data": [
                    {
                        "name": "dns-servers",