diff --git a/doc/sphinx/arm/ctrl-channel.rst b/doc/sphinx/arm/ctrl-channel.rst index 5e705d4035..e53943b96f 100644 --- 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 30afb478ea..a76c691cdb 100644 --- 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 06197d469b..b112e1e720 100644 --- 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 0116e752ea..b8b460c336 100755 --- 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 - #
Expand here! - #
{
-			#    ...
-			#    }
- #

json=1 # ignore any map name before top level map line=$(echo "$line" | sed "s/.*{/{/g")