From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 31 Oct 2018 18:58:38 +0000 (+0100)
Subject: [#39,!108] Docs fixed.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2F39-class-options-experiment;p=thirdparty%2Fkea.git

[#39,!108] Docs fixed.
---

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index d7a7720e49..4f54255529 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -1348,12 +1348,13 @@ temporarily override a list of interface names and listen on all interfaces.
       </para>
      <para>
        Options can be specified also in class of host reservation scope.
-       In Kea 1.4 options precedence order is (from most important):
-       host reservation, pool, subnet, shared network, class, global.
-       In Kea 1.5 order will be changed to:
-       host reservation, class, pool, subnet, shared network, global OR it will
-       be fully configurable.
      </para>
+     <note>
+       In Kea 1.5 the precedence order is (from most important): host
+       reservation, class, pool, subnet, shared network, global. In Kea 1.4 and
+       earlier the was: host reservation, pool, subnet, shared network, class,
+       global. Note the difference in how client class options are now treated.
+     </note>
 
       <para>
         The currently supported standard DHCPv4 options are
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index a8a6f6be3f..ecbd7be3a1 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -1243,12 +1243,13 @@ temporarily override a list of interface names and listen on all interfaces.
      </para>
     <para>
       Options can be specified also in class of host reservation scope.
-      In Kea 1.4 options precedence order is (from most important):
-      host reservation, pool, subnet, shared network, class, global.
-      In Kea 1.5 order will be changed to:
-      host reservation, class, pool, subnet, shared network, global OR it will
-      be fully configurable.
     </para>
+     <note>
+       In Kea 1.5 the precedence order is (from most important): host
+       reservation, class, pool, subnet, shared network, global. In Kea 1.4 and
+       earlier the was: host reservation, pool, subnet, shared network, class,
+       global. Note the difference in how client class options are now treated.
+     </note>
     <para>
       The currently supported standard DHCPv6 options are
       listed in <xref linkend="dhcp6-std-options-list"/>.