[#2786] addressed review comments

diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst
index 5e705d403537367143ffc026ce2547f96e62d912..e53943b96fbfc4131afb3335ad10b52648107793 100644 (file)
--- a/doc/sphinx/arm/ctrl-channel.rst
+++ b/doc/sphinx/arm/ctrl-channel.rst
@@ -98,7 +98,7 @@ following structure:
 The ``command`` parameter contains the name of the command to execute and it
 is mandatory.
 The ``arguments`` map contains the parameters required to carry out the
-given command. The exact content and format of the map are command specific.
+given command. The exact content and format of the map are command-specific.
 
 ``service`` is a list of the servers at which the control command is
 targeted. In the example above, the control command is targeted at the

diff --git a/doc/sphinx/arm/dhcp4-srv.rst b/doc/sphinx/arm/dhcp4-srv.rst
index 30afb478eac9e0999e1c0fd1825cd5eee7080a2a..a76c691cdb06df790372f97777b06a728c2892f1 100644 (file)
--- a/doc/sphinx/arm/dhcp4-srv.rst
+++ b/doc/sphinx/arm/dhcp4-srv.rst
@@ -5824,9 +5824,9 @@ finds multiple reservations for the same IP address.
 The ``reservations-lookup-first`` is a boolean parameter which controls whether
 host reservations lookup should be performed before lease lookup. This parameter
 has effect only when multi-threading is disabled. When multi-threading is
-enabled, host reservations lookup is always performed first to avoid lease
-lookup resource locking. The ``reservations-lookup-first`` parameter defaults to
-``false`` when multi-threading is disabled.
+enabled, host reservations lookup is always performed first to avoid lease-lookup
+resource locking. The ``reservations-lookup-first`` parameter defaults to ``false``
+when multi-threading is disabled.
 
 .. _host_reservations_as_basic_access_control4:
 

diff --git a/doc/sphinx/arm/dhcp6-srv.rst b/doc/sphinx/arm/dhcp6-srv.rst
index 06197d469b5d70ed8146381af58052ab5c28fb75..b112e1e720b525e0ed52378efbdcbaa33c145a38 100644 (file)
--- a/doc/sphinx/arm/dhcp6-srv.rst
+++ b/doc/sphinx/arm/dhcp6-srv.rst
@@ -5026,8 +5026,8 @@ for the same IP address or delegated prefix.
 The ``reservations-lookup-first`` is a boolean parameter which controls whether
 host reservations lookup should be performed before lease lookup. This parameter
 has effect only when multi-threading is disabled. When multi-threading is
-enabled, host reservations lookup is always performed first to avoid lease
-lookup resource locking. The ``reservations-lookup-first`` defaults to ``false``
+enabled, host reservations lookup is always performed first to avoid lease-lookup
+resource locking. The ``reservations-lookup-first`` parameter defaults to ``false``
 when multi-threading is disabled.
 
 .. _host_reservations_as_basic_access_control6:

diff --git a/tools/check-for-json-errors-in-doc.sh b/tools/check-for-json-errors-in-doc.sh
index 0116e752ea82b0dff5f4cfd1fa8cae0a701b58d2..b8b460c3361a6010d752c0bde8e0f677ab06d1fa 100755 (executable)
--- a/tools/check-for-json-errors-in-doc.sh
+++ b/tools/check-for-json-errors-in-doc.sh
@@ -32,20 +32,8 @@ for file in $files; do
                        comment=0
                        echo "" >> $work_file
                        continue
-               elif [ $comment -eq 0 -a $json -eq 0 -a $(echo "$line" | grep "^\s*{\|^\s*\".*{" | grep -v "}" | grep -v "key\|pre" | wc -l) -eq 1 ]; then
+               elif [ $comment -eq 0 -a $json -eq 0 -a $(echo "$line" | grep "^\s*{\|^\s*\".*{" | grep -v "}" | wc -l) -eq 1 ]; then
                        # if this is not a comment and the line starts with spaces followed by '{' or by '"' followed by "{"
-                       # ignore dns config:
-                       #      key "key.four.example.com." {
-                       #          algorithm hmac-sha224;
-                       #          secret "bZEG7Ow8OgAUPfLWV3aAUQ==";
-                       #      };
-                       # ignore detailed html:
-                       #    .. raw:: html
-                       #    <details><summary>Expand here!</summary>
-                       #    <pre>{
-                       #    ...
-                       #    }</pre>
-                       #    </details><br>
                        json=1
                        # ignore any map name before top level map
                        line=$(echo "$line" | sed "s/.*{/{/g")