Commit 025ee767 authored by Jeremy C. Reed's avatar Jeremy C. Reed
Browse files

use entity — instead of - dash

parent 23275461
...@@ -135,8 +135,8 @@ the configuration file must be a well formed JSON. That means that parameters ...@@ -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 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 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 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 moving the comma as well. The second caveat is that it is uncommon — although
legal JSON - to legal JSON — to
repeat the same parameter multiple times. If that appears, the last occurrence of a 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 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 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. ...@@ -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 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 the option definition. (Such an option would then have the following
data structure: DHCP header, uint16 value, sub-options.) The value specified data structure: DHCP header, uint16 value, sub-options.) The value specified
with the "data" parameter - which should be a valid integer enclosed in quotes, 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. e.g. "123" — would then be assigned to the uint16 field in the "container" option.
</para> </para>
</section> </section>
...@@ -1702,8 +1702,8 @@ temporarily override a list of interface names and listen on all interfaces. ...@@ -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. field of the DHCPv4 packet) to select the appropriate subnet.
</para> </para>
<para> <para>
However, that is not always the case. In certain uncommon - but However, that is not always the case. In certain uncommon &mdash;
valid - deployments, the relay address may not match the subnet. This valid &mdash; deployments, the relay address may not match the subnet. This
usually means that there is more than one subnet allocated for a given 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 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 network renumbering (where both old and new address space is still being
......
...@@ -137,8 +137,8 @@ the configuration file must be a well formed JSON. That means that parameters ...@@ -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 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 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 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 moving the comma as well. The second caveat is that it is uncommon &mdash; although
legal JSON - to legal JSON &mdash; to
repeat the same parameter multiple times. If that happens, the last occurrence of a 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 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 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: ...@@ -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" 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 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 option would then have the following data structure: DHCP header, uint16
value, sub-options.) The value specified with the "data" parameter - which value, sub-options.) The value specified with the "data" parameter &mdash; which
should be a valid integer enclosed in quotes, e.g. "123" - would then be should be a valid integer enclosed in quotes, e.g. "123" &mdash; would then be
assigned to the uint16 field in the "container" option. assigned to the uint16 field in the "container" option.
</para> </para>
</section> </section>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment