From: Marcin Siodelski Date: Tue, 11 Dec 2018 10:26:49 +0000 (+0100) Subject: [#198,!160] Modify DHCPv4/v6 sections to not recommend combining configs. X-Git-Tag: 343-put-socket-control-buffer-in-the-stack_base~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cadf94bf6fe0e0a7751cd9bd87f7ce42b586009;p=thirdparty%2Fkea.git [#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 1973f0a369..485a60fe06 100644 --- 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. 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 Logging or -DhcpDdns, but we omit them now for clarity. The Dhcp4 -configuration starts with the "Dhcp4": { 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 Dhcp4. + + + + 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 Logging. + However, we don't include this object in the example above for clarity. + + + +The Dhcp4 configuration starts with the "Dhcp4": { 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. diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 33075797a8..2b202657ce 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -193,13 +193,24 @@ for these and other parameters. the server; they do not impact its operation in any way. + 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 Logging or -DhcpDdns, but we omit them now for clarity. The Dhcp6 -configuration starts with the "Dhcp6": { 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 Dhcp6. + + + + 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 Logging. + However, we don't include this object in the example above for clarity. + + + +The Dhcp6 configuration starts with the "Dhcp6": { 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.