From: Jeremy C. Reed Date: Mon, 11 Aug 2014 19:03:58 +0000 (+0000) Subject: use entity — instead of - dash X-Git-Tag: trac3482_base~41^2~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=025ee767a32d643acaf56e87799099bacacdef02;p=thirdparty%2Fkea.git use entity — instead of - dash --- diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml index 2af7fe3c33..3fbd4f760c 100644 --- a/doc/guide/dhcp4-srv.xml +++ b/doc/guide/dhcp4-srv.xml @@ -135,8 +135,8 @@ the configuration file must be a well formed JSON. That means that parameters for any given scope must be separate by a comma and there must not be a comma after the last parameter. When reordering configuration file, keep in mind that moving a parameter to or from the last position in a given scope may require -moving the comma as well. The second caveat is that it is uncommon - although -legal JSON - to +moving the comma as well. The second caveat is that it is uncommon — although +legal JSON — to repeat the same parameter multiple times. If that appears, the last occurrence of a given parameter in a given scope is used while all previous instances are ignored. This is unlikely to cause any confusion as there are no real life @@ -1078,8 +1078,8 @@ temporarily override a list of interface names and listen on all interfaces. value as well as the sub-options, the "type" value would have to be set to "uint16" in the option definition. (Such an option would then have the following data structure: DHCP header, uint16 value, sub-options.) The value specified - with the "data" parameter - which should be a valid integer enclosed in quotes, - e.g. "123" - would then be assigned to the uint16 field in the "container" option. + with the "data" parameter — which should be a valid integer enclosed in quotes, + e.g. "123" — would then be assigned to the uint16 field in the "container" option. @@ -1702,8 +1702,8 @@ temporarily override a list of interface names and listen on all interfaces. field of the DHCPv4 packet) to select the appropriate subnet. - However, that is not always the case. In certain uncommon - but - valid - deployments, the relay address may not match the subnet. This + However, that is not always the case. In certain uncommon — + valid — deployments, the relay address may not match the subnet. This usually means that there is more than one subnet allocated for a given link. The two most common examples where this is the case are long lasting network renumbering (where both old and new address space is still being diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml index 1218a81359..3713a4b293 100644 --- a/doc/guide/dhcp6-srv.xml +++ b/doc/guide/dhcp6-srv.xml @@ -137,8 +137,8 @@ the configuration file must be a well formed JSON. That means that parameters for any given scope must be separate by a comma and there must not be a comma after the last parameter. When reordering configuration file, keep in mind that moving a parameter to or from the last position in a given scope may require -moving the comma as well. The second caveat is that it is uncommon - although -legal JSON - to +moving the comma as well. The second caveat is that it is uncommon — although +legal JSON — to repeat the same parameter multiple times. If that happens, the last occurrence of a given parameter in a given scope is used while all previous instances are ignored. This is unlikely to cause any confusion as there are no real life @@ -1071,8 +1071,8 @@ should include options from the isc option space: required to carry an uint16 value as well as the sub-options, the "type" value would have to be set to "uint16" in the option definition. (Such an option would then have the following data structure: DHCP header, uint16 - value, sub-options.) The value specified with the "data" parameter - which - should be a valid integer enclosed in quotes, e.g. "123" - would then be + value, sub-options.) The value specified with the "data" parameter — which + should be a valid integer enclosed in quotes, e.g. "123" — would then be assigned to the uint16 field in the "container" option.