From: Marcin Siodelski Date: Tue, 20 Nov 2018 15:44:26 +0000 (+0100) Subject: [268-reservation-mode-is-not-global] Minor editorial updates in User's Guide. X-Git-Tag: 204-move-models-base~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e02fc3fa843b8a0da8c05324195c81ba98bb951;p=thirdparty%2Fkea.git [268-reservation-mode-is-not-global] Minor editorial updates in User's Guide. --- diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 43b3e632f3..b848cb48f5 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -3797,7 +3797,7 @@ It is merely echoed by the server } - Options defined on host level have the highest priority. In other words, + Options defined at host level have the highest priority. In other words, if there are options defined with the same type on global, subnet, class and host level, the host specific values will be used. @@ -3975,8 +3975,8 @@ It is merely echoed by the server - The parameter can be specified in global, subnet and shared network - level. + The parameter can be specified at global, subnet and shared network + levels. @@ -4224,7 +4224,7 @@ src/lib/dhcpsrv/cfg_host_operations.cc --> // and it must be unique among all shared networks. "name": "my-secret-lair-level-1", - // Subnet selector can be specifed on the shared network level. + // Subnet selector can be specifed at the shared network level. // Subnets from this shared network will be selected for directly // connected clients sending requests to server's "eth0" interface. "interface": "eth0", @@ -4344,12 +4344,12 @@ src/lib/dhcpsrv/cfg_host_operations.cc --> It is possible to specify interface name in the shared network scope to tell the server that this specific shared network is reachable directly (not via relays) using local network interface. It is sufficient to specify - it once on the shared network level. As all subnets in a shared network are + it once at the shared network level. As all subnets in a shared network are expected to be used on the same physical link, it is a configuration error to attempt to define a shared network using subnets that are reachable over different interfaces. It is allowed to specify interface parameter on each subnet, although its value must be the same for each subnet. Thus it's - usually more convenient to specify it once on the shared network level. + usually more convenient to specify it once at the shared network level. "shared-networks": [ { @@ -4409,9 +4409,9 @@ for each subnet. Here's an example: ] } ] -In this particular case the relay IP address specified on network level doesn't +In this particular case the relay IP address specified at network level doesn't have much sense, as it is overridden in both subnets, but it was left there -as an example of how one could be defined on network level. Note that the +as an example of how one could be defined at network level. Note that the relay agent IP address typically belongs to the subnet it relays packets from, but this is not a strict requirement. Therefore Kea accepts any value here as long as it is valid IPv4 address. @@ -4607,7 +4607,7 @@ autogenerated IDs are not stable across configuration changes. It is possible to override default server identifier values by specifying - "dhcp-server-identifier" option. This option is only supported on the + "dhcp-server-identifier" option. This option is only supported at the global, shared network and subnet level. It must not be specified on client class and host reservation level. @@ -5284,7 +5284,7 @@ autogenerated IDs are not stable across configuration changes. - User contexts can be specified on either global scope, + User contexts can be specified at either global scope, shared network, subnet, pool, client class, option data or definition level, and host reservation. One other useful usage is the ability to store comments or descriptions. diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 6f48b336fd..4a2eb19718 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -3456,7 +3456,7 @@ should include options from the isc option space: } ] - Options defined on host level have the highest priority. In other words, + Options defined at host level have the highest priority. In other words, if there are options defined with the same type on global, subnet, class and host level, the host specific values will be used. @@ -3603,8 +3603,8 @@ should include options from the isc option space: - The parameter can be specified in global, subnet and shared network - level. + The parameter can be specified at global, subnet and shared network + levels. @@ -3980,12 +3980,12 @@ If not specified, the default value is: It is possible to specify interface name in the shared network scope to tell the server that this specific shared network is reachable directly (not via relays) using local network interface. It is sufficient to specify - it once in the shared network level. As all subnets in a shared network are + it once at the shared network level. As all subnets in a shared network are expected to be used on the same physical link, it is a configuration error to attempt to make a shared network out of subnets that are reachable over different interfaces. It is allowed to specify interface parameter on each subnet, although its value must be the same for each subnet. Thus it's - usually more convenient to specify it once on the shared network level. + usually more convenient to specify it once at the shared network level. "shared-networks": [ { @@ -4045,9 +4045,9 @@ for each subnet. Here's an example: ] } ] -In this particular case the relay IP address specified on network level doesn't +In this particular case the relay IP address specified at network level doesn't have much sense, as it is overridden in both subnets, but it was left there -as an example of how one could be defined on network level. Note that the +as an example of how one could be defined at network level. Note that the relay agent IP address typically belongs to the subnet it relays packets from, but this is not a strict requirement. Therefore Kea accepts any value here as long as it is valid IPv6 address. @@ -5349,7 +5349,7 @@ autogenerated IDs are not stable across configuration changes. - User contexts can be specified on either global scope, + User contexts can be specified at either global scope, shared network, subnet, pool, client class, option data or definition level, and host reservation. One other useful usage is the ability to store comments or descriptions.