[#198,!160] Modify DHCPv4/v6 sections to not recommend combining configs.

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 1973f0a369e2f14be04bd4682a7336d18524431f..485a60fe06eb023ba7f35fd41264016eee974f46 100644 (file)
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -193,12 +193,22 @@ the server; they do not impact its
 operation in any way.</para>
 
 <para>The configuration starts in the first line with the initial
-opening curly bracket (or brace). Each configuration consists of
-one or more objects. In this specific example, we have only one
-object, called Dhcp4. This is a simplified configuration, as usually
-there will be additional objects, like <command>Logging</command> or
-<command>DhcpDdns</command>, but we omit them now for clarity. The Dhcp4
-configuration starts with the <command>"Dhcp4": {</command> line
+opening curly bracket (or brace). Each configuration must contain an
+object specifying the configuration of the Kea module using it.
+In the example above this object is called <command>Dhcp4</command>.
+</para>
+
+<note>
+  <para>In the current Kea release it is possible to specify configurations
+  of multiple modules within a single configuration file, but this is not
+  recommended and support for it will be removed in the future releases. The
+  only object, besides the one specifying module configuration, which can
+  (and usually is) included in the same file is <command>Logging</command>.
+  However, we don't include this object in the example above for clarity.
+  </para>
+</note>
+
+<para>The Dhcp4 configuration starts with the <command>"Dhcp4": {</command> line
 and ends with the corresponding closing brace (in the above example,
 the brace after the last comment).  Everything defined between those
 lines is considered to be the Dhcp4 configuration.</para>

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 33075797a8a41f157bd4fcea5b0af42e54fa6cc8..2b202657ce28d56b350bec8ac684e6687628dbc7 100644 (file)
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -193,13 +193,24 @@ for these and other parameters.</para>
 the server; they do not impact its
 operation in any way.</para>
 
+
 <para>The configuration starts in the first line with the initial
-opening curly bracket (or brace). Each configuration consists of
-one or more objects. In this specific example, we have only one
-object, called Dhcp6. This is a simplified configuration, as usually
-there will be additional objects, like <command>Logging</command> or
-<command>DhcpDdns</command>, but we omit them now for clarity. The Dhcp6
-configuration starts with the <command>"Dhcp6": {</command> line
+opening curly bracket (or brace). Each configuration must contain an
+object specifying the configuration of the Kea module using it.
+In the example above this object is called <command>Dhcp6</command>.
+</para>
+
+<note>
+  <para>In the current Kea release it is possible to specify configurations
+  of multiple modules within a single configuration file, but this is not
+  recommended and support for it will be removed in the future releases. The
+  only object, besides the one specifying module configuration, which can
+  (and usually is) included in the same file is <command>Logging</command>.
+  However, we don't include this object in the example above for clarity.
+  </para>
+</note>
+
+<para>The Dhcp6 configuration starts with the <command>"Dhcp6": {</command> line
 and ends with the corresponding closing brace (in the above example,
 the brace after the last comment).  Everything defined between those
 lines is considered to be the Dhcp6 configuration.</para>