From 8ffc32fbb29f5369c480a261cc488737e327636c Mon Sep 17 00:00:00 2001
From: Razvan Becheriu <razvan@isc.org>
Date: Thu, 8 Aug 2019 21:18:38 +0300
Subject: [PATCH 01/13] [#810, !471] fixed sphinx docs

---
 doc/sphinx/api/cache-get-by-id.json              |  7 ++++---
 doc/sphinx/api/cache-get.json                    |  6 +++---
 doc/sphinx/api/cache-insert.json                 |  2 +-
 doc/sphinx/api/cache-size.json                   |  6 +++---
 doc/sphinx/api/class-add.json                    |  2 +-
 doc/sphinx/api/class-list.json                   |  2 +-
 doc/sphinx/api/class-update.json                 |  2 +-
 doc/sphinx/api/config-get.json                   |  2 +-
 doc/sphinx/api/config-set.json                   | 10 +++++-----
 doc/sphinx/api/config-test.json                  |  4 ++--
 doc/sphinx/api/ha-heartbeat.json                 |  2 +-
 doc/sphinx/api/ha-scopes.json                    |  5 +++--
 doc/sphinx/api/ha-sync.json                      |  2 +-
 doc/sphinx/api/lease4-add.json                   |  2 +-
 doc/sphinx/api/lease4-get-all.json               |  4 ++--
 doc/sphinx/api/lease6-add.json                   |  2 +-
 doc/sphinx/api/lease6-bulk-apply.json            |  4 ++--
 doc/sphinx/api/network4-get.json                 |  4 ++--
 doc/sphinx/api/network6-get.json                 |  4 ++--
 doc/sphinx/api/remote-global-parameter4-set.json |  2 +-
 doc/sphinx/api/remote-network4-del.json          |  2 +-
 21 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/doc/sphinx/api/cache-get-by-id.json b/doc/sphinx/api/cache-get-by-id.json
index 10a24a990a..c6cfa3658d 100644
--- a/doc/sphinx/api/cache-get-by-id.json
+++ b/doc/sphinx/api/cache-get-by-id.json
@@ -9,13 +9,14 @@
         "    \"arguments\": {",
         "        \"hw-address\": \"01:02:03:04:05:06\"",
         "    }"
+        "}"
     ],
     "hook": "host_cache",
     "name": "cache-get-by-id",
     "resp-syntax": [
         "{",
-        "    \"result\": 0",
-        "    \"text\": \"2 entries returned.\"",
+        "    \"result\": 0,",
+        "    \"text\": \"2 entries returned.\",",
         "    \"arguments\": <list of host reservations>",
         "}"
     ],
@@ -23,4 +24,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-get.json b/doc/sphinx/api/cache-get.json
index 3c27a11218..af8b020180 100644
--- a/doc/sphinx/api/cache-get.json
+++ b/doc/sphinx/api/cache-get.json
@@ -7,8 +7,8 @@
     "name": "cache-get",
     "resp-syntax": [
         "{",
-        "    \"result\": 0",
-        "    \"text\": \"123 entries returned.\"",
+        "    \"result\": 0,",
+        "    \"text\": \"123 entries returned.\",",
         "    \"arguments\": <list of host reservations>",
         "}"
     ],
@@ -16,4 +16,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-insert.json b/doc/sphinx/api/cache-insert.json
index 64c9bc6565..c8354e910e 100644
--- a/doc/sphinx/api/cache-insert.json
+++ b/doc/sphinx/api/cache-insert.json
@@ -49,4 +49,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-size.json b/doc/sphinx/api/cache-size.json
index b5340733d4..0b44bdeccc 100644
--- a/doc/sphinx/api/cache-size.json
+++ b/doc/sphinx/api/cache-size.json
@@ -7,8 +7,8 @@
     "name": "cache-size",
     "resp-syntax": [
         "{",
-        "    \"result\": 0",
-        "    \"text\": \"123 entries.\"",
+        "    \"result\": 0,",
+        "    \"text\": \"123 entries.\",",
         "    \"arguments\": { \"size\": 123 }",
         "}"
     ],
@@ -16,4 +16,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/class-add.json b/doc/sphinx/api/class-add.json
index 611f1a490c..69a6529c73 100644
--- a/doc/sphinx/api/class-add.json
+++ b/doc/sphinx/api/class-add.json
@@ -34,7 +34,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"Class '<class-name>' added.\",",
+        "    \"text\": \"Class '<class-name>' added.\"",
         "}"
     ],
     "support": [
diff --git a/doc/sphinx/api/class-list.json b/doc/sphinx/api/class-list.json
index 36486cbfd3..4f80828c67 100644
--- a/doc/sphinx/api/class-list.json
+++ b/doc/sphinx/api/class-list.json
@@ -28,7 +28,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"<number of> classes found\",",
+        "    \"text\": \"'<number of>' classes found\",",
         "    \"arguments\": {",
         "        \"client-classes\": [",
         "            {",
diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json
index dd8d67baf8..acefa18024 100644
--- a/doc/sphinx/api/class-update.json
+++ b/doc/sphinx/api/class-update.json
@@ -36,7 +36,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"Class '<class-name>' updated.\",",
+        "    \"text\": \"Class '<class-name>' updated.\"",
         "}"
     ],
     "support": [
diff --git a/doc/sphinx/api/config-get.json b/doc/sphinx/api/config-get.json
index 2bee41388a..6c4f8231fe 100644
--- a/doc/sphinx/api/config-get.json
+++ b/doc/sphinx/api/config-get.json
@@ -18,7 +18,7 @@
         "{",
         "    \"result\": <integer>,",
         "    \"arguments\": {",
-        "        <JSON configuration here, starting with Dhcp4, Dhcp6, or Control-agent object>",
+        "        <Dhcp4, Dhcp6, or Control-agent object>: <JSON configuration here> ",
         "    }",
         "}"
     ],
diff --git a/doc/sphinx/api/config-set.json b/doc/sphinx/api/config-set.json
index 02fc74a7cf..3270c20955 100644
--- a/doc/sphinx/api/config-set.json
+++ b/doc/sphinx/api/config-set.json
@@ -4,13 +4,13 @@
         "The config-set command instructs the server to replace its current configuration with the new configuration supplied in the command's arguments."
     ],
     "cmd-comment": [
-        "where `<server>` is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\""
+        "where '<server>' is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\""
     ],
     "cmd-syntax": [
         "{",
         "    \"command\": \"config-set\",",
         "    \"arguments\":  {",
-        "        \"<server>\": {",
+        "        \"'<server>'\": {",
         "        }",
         "     }",
         "}"
@@ -18,11 +18,11 @@
     "description": "See <xref linkend=\"command-config-set\"/>",
     "name": "config-set",
     "resp-syntax": [
-        "    {\"result\": 0, \"text\": \"Configuration successful.\" }",
+        "{\"result\": 0, \"text\": \"Configuration successful.\" }",
         "",
-        "    or",
+        "or",
         "",
-        "    {\"result\": 1, \"text\": \"unsupported parameter: BOGUS (<string>:16:26)\" }"
+        "{\"result\": 1, \"text\": \"unsupported parameter: BOGUS (<string>:16:26)\" }"
     ],
     "support": [
         "kea-dhcp4",
diff --git a/doc/sphinx/api/config-test.json b/doc/sphinx/api/config-test.json
index 335d06e9db..c77f1697e8 100644
--- a/doc/sphinx/api/config-test.json
+++ b/doc/sphinx/api/config-test.json
@@ -10,7 +10,7 @@
         "{",
         "    \"command\": \"config-test\",",
         "    \"arguments\":  {",
-        "        \"<server>\": {",
+        "        \"'<server>'\": {",
         "        }",
         "     }",
         "}"
@@ -20,7 +20,7 @@
     "resp-syntax": [
         "{ \"result\": 0, \"text\": \"Configuration seems sane...\" }",
         "",
-        "    or",
+        "or",
         "",
         "{ \"result\": 1, \"text\": \"unsupported parameter: BOGUS (<string>:16:26)\" }"
     ],
diff --git a/doc/sphinx/api/ha-heartbeat.json b/doc/sphinx/api/ha-heartbeat.json
index c1eed190e6..bfac1099e7 100644
--- a/doc/sphinx/api/ha-heartbeat.json
+++ b/doc/sphinx/api/ha-heartbeat.json
@@ -6,7 +6,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"ha-heartbeat\",",
+        "    \"command\": \"ha-heartbeat\"",
         "    }"
     ],
     "description": "See <xref linkend=\"ha-server-states\"/>",
diff --git a/doc/sphinx/api/ha-scopes.json b/doc/sphinx/api/ha-scopes.json
index 889961d593..c8aca2dd41 100644
--- a/doc/sphinx/api/ha-scopes.json
+++ b/doc/sphinx/api/ha-scopes.json
@@ -9,10 +9,11 @@
     "cmd-syntax": [
         "{",
         "    \"command\": \"ha-scopes\",",
-        "    \"service\": [ <service, typically \"dhcp4\" or \"dhcp6\"> ],",
+        "    \"service\": [ <service, typically 'dhcp4' or 'dhcp6'> ],",
         "    \"arguments\": {",
         "        \"scopes\": [ \"HA_server1\", \"HA_server2\" ]",
         "    }"
+        "}"
     ],
     "description": "See <xref linkend=\"command-ha-scopes\"/>",
     "hook": "high_availability",
@@ -21,4 +22,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/ha-sync.json b/doc/sphinx/api/ha-sync.json
index 52b34e40f5..2c1fa9dad7 100644
--- a/doc/sphinx/api/ha-sync.json
+++ b/doc/sphinx/api/ha-sync.json
@@ -7,7 +7,7 @@
     "cmd-syntax": [
         "{",
         "    \"command\": \"ha-sync\",",
-        "    \"service\": [ <service affected: \"dhcp4\" or \"dhcp6\" ],",
+        "    \"service\": [ <service affected: 'dhcp4' or 'dhcp6'> ],",
         "    \"arguments\": {",
         "        \"server-name\": <name of the partner server>,",
         "        \"max-period\": <integer, in seconds>",
diff --git a/doc/sphinx/api/lease4-add.json b/doc/sphinx/api/lease4-add.json
index 27e079f721..e9b701f81f 100644
--- a/doc/sphinx/api/lease4-add.json
+++ b/doc/sphinx/api/lease4-add.json
@@ -21,4 +21,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease4-get-all.json b/doc/sphinx/api/lease4-get-all.json
index 5c33b9d19d..f8eb99f999 100644
--- a/doc/sphinx/api/lease4-get-all.json
+++ b/doc/sphinx/api/lease4-get-all.json
@@ -8,7 +8,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"lease4-get-all\"",
+        "    \"command\": \"lease4-get-all\",",
         "    \"arguments\": \"subnets\"",
         "}"
     ],
@@ -18,4 +18,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease6-add.json b/doc/sphinx/api/lease6-add.json
index a8fd13fe58..344e7841f5 100644
--- a/doc/sphinx/api/lease6-add.json
+++ b/doc/sphinx/api/lease6-add.json
@@ -22,7 +22,7 @@
     "name": "lease6-add",
     "resp-syntax": [
         "{ \"result\": 0, \"text\": \"Lease added.\" }",
-        " or ",
+        "or",
         "{ \"result\": 1, \"text\": \"missing parameter 'ip-address' (<string>:3:19)\" }"
     ],
     "support": [
diff --git a/doc/sphinx/api/lease6-bulk-apply.json b/doc/sphinx/api/lease6-bulk-apply.json
index 7f0e42dd47..77b223555a 100644
--- a/doc/sphinx/api/lease6-bulk-apply.json
+++ b/doc/sphinx/api/lease6-bulk-apply.json
@@ -48,7 +48,7 @@
         " {",
         "    {",
         "        \"result\": 0,",
-        "        \"text\": IPv6 leases bulk apply completed.",
+        "        \"text\": \"IPv6 leases bulk apply completed.\",",
         "        \"arguments\": {",
         "            \"failed-deleted-leases\": [",
         "                {",
@@ -62,7 +62,7 @@
         "                {",
         "                    \"ip-address\": \"2001:db8:cafe::\",",
         "                    \"type\": \"IA_PD\",",
-        "                    \"result\" <control result>,",
+        "                    \"result\": <control result>,",
         "                    \"error-message\": <error message>",
         "                }",
         "            ]",
diff --git a/doc/sphinx/api/network4-get.json b/doc/sphinx/api/network4-get.json
index a85de53d4d..a386286e13 100644
--- a/doc/sphinx/api/network4-get.json
+++ b/doc/sphinx/api/network4-get.json
@@ -40,8 +40,8 @@
         "                    // many other subnet specific details here",
         "                },",
         "                {",
-        "                    \"id\": 6,",
         "                    \"subnet\": \"192.0.3.0/31\",",
+        "                    \"id\": 6,",
         "                    // many other subnet specific details here",
         "                }",
         "            ],",
@@ -54,4 +54,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network6-get.json b/doc/sphinx/api/network6-get.json
index 10dbfd6ebe..893bb17cb9 100644
--- a/doc/sphinx/api/network6-get.json
+++ b/doc/sphinx/api/network6-get.json
@@ -40,8 +40,8 @@
         "                    // many other subnet specific details here",
         "                },",
         "                {",
-        "                    \"id\": 6,",
         "                    \"subnet\": \"192.0.3.0/31\",",
+        "                    \"id\": 6,",
         "                    // many other subnet specific details here",
         "                }",
         "            ],",
@@ -54,4 +54,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/remote-global-parameter4-set.json b/doc/sphinx/api/remote-global-parameter4-set.json
index 469026f0ab..c1e5dbba29 100644
--- a/doc/sphinx/api/remote-global-parameter4-set.json
+++ b/doc/sphinx/api/remote-global-parameter4-set.json
@@ -8,7 +8,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-global-parameter4-set\"",
+        "    \"command\": \"remote-global-parameter4-set\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
         "            <first parameter name>: <first parameter value>,",
diff --git a/doc/sphinx/api/remote-network4-del.json b/doc/sphinx/api/remote-network4-del.json
index 28be9a35db..5721162e80 100644
--- a/doc/sphinx/api/remote-network4-del.json
+++ b/doc/sphinx/api/remote-network4-del.json
@@ -15,7 +15,7 @@
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-action\": \"keep\" | \"delete\",",
+        "        \"subnets-action\": '<'keep' | 'delete'>',",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
-- 
GitLab


From 295f81cb1f3c22010f21daa6570acad08655eb13 Mon Sep 17 00:00:00 2001
From: Suzanne Goldlust <sgoldlust@isc.org>
Date: Thu, 8 Aug 2019 17:39:51 -0400
Subject: [PATCH 02/13] Fix JSON syntax errors, miscellaneous typos and
 grammatical errors in API docs

---
 doc/sphinx/api/cache-get-by-id.json           |  2 +-
 doc/sphinx/api/cache-size.json                |  2 +-
 doc/sphinx/api/class-add.json                 |  4 ++--
 doc/sphinx/api/class-update.json              |  8 +++----
 doc/sphinx/api/ha-heartbeat.json              |  6 ++---
 doc/sphinx/api/lease6-bulk-apply.json         |  6 ++---
 .../api/remote-global-parameter4-set.json     |  4 ++--
 .../api/remote-global-parameter6-set.json     |  6 ++---
 doc/sphinx/api/remote-network4-get.json       |  6 ++---
 doc/sphinx/api/remote-network4-list.json      |  4 ++--
 doc/sphinx/api/remote-network6-get.json       |  6 ++---
 doc/sphinx/api/remote-network6-list.json      |  4 ++--
 .../api/remote-option-def4-get-all.json       |  6 ++---
 .../api/remote-option-def6-get-all.json       |  6 ++---
 doc/sphinx/api/remote-option4-global-del.json |  6 ++---
 doc/sphinx/api/remote-option6-global-del.json |  6 ++---
 doc/sphinx/api/remote-server4-del.json        |  6 ++---
 doc/sphinx/api/remote-server6-del.json        |  6 ++---
 doc/sphinx/api/remote-subnet4-get-by-id.json  |  8 +++----
 .../api/remote-subnet4-get-by-prefix.json     |  6 ++---
 doc/sphinx/api/remote-subnet4-list.json       |  6 ++---
 doc/sphinx/api/remote-subnet6-get-by-id.json  |  8 +++----
 .../api/remote-subnet6-get-by-prefix.json     |  6 ++---
 doc/sphinx/api/remote-subnet6-list.json       |  6 ++---
 doc/sphinx/api/reservation-get.json           | 24 +++++++++----------
 doc/sphinx/api/stat-lease4-get.json           |  7 +++---
 doc/sphinx/api/stat-lease6-get.json           |  5 ++--
 doc/sphinx/api/subnet4-get.json               |  6 ++---
 doc/sphinx/api/subnet6-get.json               |  6 ++---
 29 files changed, 90 insertions(+), 92 deletions(-)

diff --git a/doc/sphinx/api/cache-get-by-id.json b/doc/sphinx/api/cache-get-by-id.json
index c6cfa3658d..91d5160a8a 100644
--- a/doc/sphinx/api/cache-get-by-id.json
+++ b/doc/sphinx/api/cache-get-by-id.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Returns entries matching the given identifier from  the host cache."
+        "Returns entries matching the given identifier from the host cache."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/cache-size.json b/doc/sphinx/api/cache-size.json
index 0b44bdeccc..c7e227147c 100644
--- a/doc/sphinx/api/cache-size.json
+++ b/doc/sphinx/api/cache-size.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Returns number of entries of the host cache."
+        "Returns the number of entries in the host cache."
     ],
     "hook": "host_cache",
     "name": "cache-size",
diff --git a/doc/sphinx/api/class-add.json b/doc/sphinx/api/class-add.json
index 69a6529c73..e4868e27ce 100644
--- a/doc/sphinx/api/class-add.json
+++ b/doc/sphinx/api/class-add.json
@@ -5,7 +5,7 @@
         "server configuration."
     ],
     "cmd-comment": [
-        "The ``next-server``, ``server-hostname`` and ``boot-file-name`` are DHCPv4 specific. Only",
+        "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only",
         "one client class can be added with a single command. "
     ],
     "cmd-syntax": [
@@ -16,7 +16,7 @@
         "           \"name\": <name of the class>,",
         "           \"test\": <test expression to be evaluated on incoming packets>,",
         "           \"option-data\": [ <option values here> ],",
-        "           \"option-def\": [ <option defintions here> ],",
+        "           \"option-def\": [ <option definitions here> ],",
         "           \"next-server\": <ipv4 address>,",
         "           \"server-hostname\": <string>,",
         "           \"boot-file-name\": <name of the boot file>",
diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json
index acefa18024..0cea24e0c3 100644
--- a/doc/sphinx/api/class-update.json
+++ b/doc/sphinx/api/class-update.json
@@ -5,7 +5,7 @@
         "the server configuration."
     ],
     "cmd-comment": [
-        "The ``next-server``, ``server-hostname`` and ``boot-file-name`` are DHCPv4 specific. Only",
+        "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only",
         "one client class can be updated with a single command. "
     ],
     "cmd-syntax": [
@@ -16,7 +16,7 @@
         "           \"name\": <name of the class>,",
         "           \"test\": <test expression to be evaluated on incoming packets>,",
         "           \"option-data\": [ <option values here> ],",
-        "           \"option-def\": [ <option defintions here> ],",
+        "           \"option-def\": [ <option definitions here> ],",
         "           \"next-server\": <ipv4 address>,",
         "           \"server-hostname\": <string>,",
         "           \"boot-file-name\": <name of the boot file>",
@@ -29,8 +29,8 @@
     "name": "class-update",
     "resp-comment": [
         "The command will return the result of 3 (empty) if the client",
-        "class doesn't exist. If the client class exists, the retured",
-        "result is 0 if the update was successful and the result is 1",
+        "class doesn't exist. If the client class exists, the returned",
+        "result is 0 if the update was successful; the result is 1",
         "if the update is unsuccessful."
     ],
     "resp-syntax": [
diff --git a/doc/sphinx/api/ha-heartbeat.json b/doc/sphinx/api/ha-heartbeat.json
index bfac1099e7..991c388f0b 100644
--- a/doc/sphinx/api/ha-heartbeat.json
+++ b/doc/sphinx/api/ha-heartbeat.json
@@ -1,8 +1,8 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command is sent internally by Kea partner when operating",
-        "in High Availability (HA) mode. It will retrieve the server HA state and clock value."
+        "This command is sent internally by a Kea partner when operating",
+        "in High-Availability (HA) mode. It retrieves the server's HA state and clock value."
     ],
     "cmd-syntax": [
         "{",
@@ -13,7 +13,7 @@
     "hook": "high_availability",
     "name": "ha-heartbeat",
     "resp-comment": [
-        "The response to this command is different from the typical command response. The response will include server state (see :ref:`ha-server-states`) plus the current clock value."
+        "The response to this command is different from the typical command response. The response includes the server state (see :ref:`ha-server-states`) plus the current clock value."
     ],
     "support": [
         "kea-dhcp4",
diff --git a/doc/sphinx/api/lease6-bulk-apply.json b/doc/sphinx/api/lease6-bulk-apply.json
index 77b223555a..b9d5363a33 100644
--- a/doc/sphinx/api/lease6-bulk-apply.json
+++ b/doc/sphinx/api/lease6-bulk-apply.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The lease6-bulk-apply command can be used to create, update and delete multiple IPv6 leases in a single transaction. This is used to communicate lease changes between the HA peers but may be used in all cases when it is desired to apply multiple lease updates in a single transaction."
+        "The lease6-bulk-apply command can be used to create, update, and delete multiple IPv6 leases in a single transaction. This is used to communicate lease changes between the HA peers, but may be used in all cases where it is desirable to apply multiple lease updates in a single transaction."
     ],
     "cmd-comment": [
-        "If any of the leases is malformed, all changes are rolled back. If the leases are well formed but the operation fails for one or more leases, the these leases are listed in the response but the changes are preserved for all leases for which the operation was successful. The \"deleted-leases\" and \"leases\" are optional parameters but one of them must be specified."
+        "If any of the leases is malformed, all changes are rolled back. If the leases are well-formed but the operation fails for one or more leases, these leases are listed in the response; however, the changes are preserved for all leases for which the operation was successful. The \"deleted-leases\" and \"leases\" are optional parameters but one of them must be specified."
     ],
     "cmd-syntax": [
         "{",
@@ -42,7 +42,7 @@
     "hook": "lease_cmds",
     "name": "lease6-bulk-apply",
     "resp-comment": [
-        "The \"failed-deleted-leases\" holds the list of leases which failed to delete. This includes leases which were not found in the database. The \"failed-leases\" includes the list of leases which failed to create or update. For each lease for which there was an error while processing the lease, inserting it into the database etc. the result is set to 1. For each lease which was not deleted because the server didn't find it in the database the result of 3 is returned."
+        "The \"failed-deleted-leases\" holds the list of leases which failed to delete. This includes leases which were not found in the database. The \"failed-leases\" includes the list of leases which failed to create or update. For each lease for which there was an error during processing, inserting it into the database, etc., the result is set to 1. For each lease which was not deleted because the server did not find it in the database, the result of 3 is returned."
     ],
     "resp-syntax": [
         " {",
diff --git a/doc/sphinx/api/remote-global-parameter4-set.json b/doc/sphinx/api/remote-global-parameter4-set.json
index c1e5dbba29..b20691165b 100644
--- a/doc/sphinx/api/remote-global-parameter4-set.json
+++ b/doc/sphinx/api/remote-global-parameter4-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or update one more global parameters in the configuration database."
+        "This command is used to create or update one or more global parameters in the configuration database."
     ],
     "cmd-comment": [
-        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter because in some cases only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter4-get-all`` may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified parameters with all servers."
+        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter; in some cases, only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter4-get-all`` command may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified parameters with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter6-set.json b/doc/sphinx/api/remote-global-parameter6-set.json
index 436c9227f6..5363544ce8 100644
--- a/doc/sphinx/api/remote-global-parameter6-set.json
+++ b/doc/sphinx/api/remote-global-parameter6-set.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or update one more global parameters in the configuration database."
+        "This command is used to create or update one or more global parameters in the configuration database."
     ],
     "cmd-comment": [
-        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter because in some cases only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter6-get-all`` may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified parameters with all servers."
+        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter; in some cases, only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter6-get-all`` command may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified parameters with all servers."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-global-parameter6-set\"",
+        "    \"command\": \"remote-global-parameter6-set\",",
         "    \"arguments\": {",
         "        \"parameters\": {",
         "            <first parameter name>: <first parameter value>,",
diff --git a/doc/sphinx/api/remote-network4-get.json b/doc/sphinx/api/remote-network4-get.json
index d5e0f22bf6..ece2780e08 100644
--- a/doc/sphinx/api/remote-network4-get.json
+++ b/doc/sphinx/api/remote-network4-get.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected IPv4 shared network for the server from the specified database."
+        "This command is used to fetch the selected IPv4 shared network for the server from the specified database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one name of the shared network to be returned. The ``subnets-include`` optional parameter allows for specifying whether the subnets belonging to the shared network should also be returned. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-network4-get\"",
+        "    \"command\": \"remote-network4-get\",",
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
@@ -25,7 +25,7 @@
     "hook": "cb_cmds",
     "name": "remote-network4-get",
     "resp-comment": [
-        "If the subnets are returned with the shared network they are carried in the ``subnet4`` list within the shared network definition. The metadata is included in the returned shared network definition and it provides the database specific information associated with the returned object."
+        "If the subnets are returned with the shared network, they are carried in the ``subnet4`` list within the shared network definition. The metadata is included in the returned shared network definition and provides the database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network4-list.json b/doc/sphinx/api/remote-network4-list.json
index 1cbe0e7527..bc45c27a6c 100644
--- a/doc/sphinx/api/remote-network4-list.json
+++ b/doc/sphinx/api/remote-network4-list.json
@@ -8,7 +8,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-network4-list\"",
+        "    \"command\": \"remote-network4-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-network4-list",
     "resp-comment": [
-        "The returned response contains the list of maps. Each map contains the shared network name and the metadata which provides database specific information associated with the shared network. The returned list does not contain full definitions of the shared networks. Use ``remote-network4-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
+        "The returned response contains the list of maps. Each map contains the shared network name and the metadata which provides database-specific information associated with the shared network. The returned list does not contain full definitions of the shared networks. Use ``remote-network4-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-get.json b/doc/sphinx/api/remote-network6-get.json
index 15665bc4ff..9264e8c687 100644
--- a/doc/sphinx/api/remote-network6-get.json
+++ b/doc/sphinx/api/remote-network6-get.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected IPv6 shared network for the server from the specified database."
+        "This command is used to fetch the selected IPv6 shared network for the server from the specified database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one name of the shared network to be returned. The ``subnets-include`` optional parameter allows for specifying whether the subnets belonging to the shared network should also be returned. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-network6-get\"",
+        "    \"command\": \"remote-network6-get\",",
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
@@ -25,7 +25,7 @@
     "hook": "cb_cmds",
     "name": "remote-network6-get",
     "resp-comment": [
-        "If the subnets are returned with the shared network they are carried in the ``subnet6`` list within the shared network definition. The metadata is included in the returned shared network definition and it provides the database specific information associated with the returned object."
+        "If the subnets are returned with the shared network, they are carried in the ``subnet6`` list within the shared network definition. The metadata is included in the returned shared network definition and provides the database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-list.json b/doc/sphinx/api/remote-network6-list.json
index f7605681ea..a1d7d238dc 100644
--- a/doc/sphinx/api/remote-network6-list.json
+++ b/doc/sphinx/api/remote-network6-list.json
@@ -8,7 +8,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-network6-list\"",
+        "    \"command\": \"remote-network6-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-network6-list",
     "resp-comment": [
-        "The returned response contains the list of maps. Each map contains the shared network name and the metadata which provides database specific information associated with the shared network. The returned list does not contain full definitions of the shared networks. Use ``remote-network6-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
+        "The returned response contains the list of maps. Each map contains the shared network name and the metadata which provides database-specific information associated with the shared network. The returned list does not contain full definitions of the shared networks. Use ``remote-network6-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-get-all.json b/doc/sphinx/api/remote-option-def4-get-all.json
index d97e0030db..5a4d49241d 100644
--- a/doc/sphinx/api/remote-option-def4-get-all.json
+++ b/doc/sphinx/api/remote-option-def4-get-all.json
@@ -4,11 +4,11 @@
         "This command is used to fetch all DHCPv4 option definitions from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the option definitions shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the option definitions shared by all servers."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-option-def4-get-all\"",
+        "    \"command\": \"remote-option-def4-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-option-def4-get-all",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains an option definition specification and the metadata including database specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the option definitions shared between all servers. It excludes server specific option definitions. If an explicit server tag is included in the command, the response contains all option definitions directly associated with the given server and the option definitions associated with all servers when server specific option definitions are not present."
+        "The returned response contains a list of maps. Each map contains an option definition specification and the metadata, including database-specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the option definitions shared among all servers. It excludes server-specific option definitions. If an explicit server tag is included in the command, the response contains all option definitions directly associated with the given server, and the option definitions associated with all servers when server-specific option definitions are not present."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-get-all.json b/doc/sphinx/api/remote-option-def6-get-all.json
index 5afa5a641b..49b9984d88 100644
--- a/doc/sphinx/api/remote-option-def6-get-all.json
+++ b/doc/sphinx/api/remote-option-def6-get-all.json
@@ -4,11 +4,11 @@
         "This command is used to fetch all DHCPv6 option definitions from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the option definitions shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the option definitions shared by all servers."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-option-def6-get-all\"",
+        "    \"command\": \"remote-option-def6-get-all\",",
         "    \"arguments\": {",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-option-def6-get-all",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains an option definition specification and the metadata including database specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the option definitions shared between all servers. It excludes server specific option definitions. If an explicit server tag is included in the command, the response contains all option definitions directly associated with the given server and the option definitions associated with all servers when server specific option definitions are not present."
+        "The returned response contains a list of maps. Each map contains an option definition specification and the metadata, including database-specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the option definitions shared among all servers. It excludes server-specific option definitions. If an explicit server tag is included in the command, the response contains all option definitions directly associated with the given server, and the option definitions associated with all servers when server-specific option definitions are not present."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option4-global-del.json b/doc/sphinx/api/remote-option4-global-del.json
index f32a6b5f6f..eae0be3961 100644
--- a/doc/sphinx/api/remote-option4-global-del.json
+++ b/doc/sphinx/api/remote-option4-global-del.json
@@ -4,7 +4,7 @@
         "This command is used to delete a DHCPv4 global option from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one option specification comprising an option name and code. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+        "This command includes a list with exactly one option specification, comprising an option name and code. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
     ],
     "cmd-syntax": [
         "{",
@@ -12,8 +12,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": <option code>",
-        "                \"space\": <option space>",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>,",
         "            }",
         "        ],",
         "        \"remote\": {",
diff --git a/doc/sphinx/api/remote-option6-global-del.json b/doc/sphinx/api/remote-option6-global-del.json
index 548959c2e3..ac9afa1a6c 100644
--- a/doc/sphinx/api/remote-option6-global-del.json
+++ b/doc/sphinx/api/remote-option6-global-del.json
@@ -4,7 +4,7 @@
         "This command is used to delete a DHCPv6 global option from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one option specification comprising an option name and code. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+        "This command includes a list with exactly one option specification, comprising an option name and code. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
     ],
     "cmd-syntax": [
         "{",
@@ -12,8 +12,8 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": <option code>",
-        "                \"space\": <option space>",
+        "                \"code\": <option code>,",
+        "                \"space\": <option space>,",
         "            }",
         "        ],",
         "        \"remote\": {",
diff --git a/doc/sphinx/api/remote-server4-del.json b/doc/sphinx/api/remote-server4-del.json
index b9ec184e33..7be6ffe98b 100644
--- a/doc/sphinx/api/remote-server4-del.json
+++ b/doc/sphinx/api/remote-server4-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete information about a DHCPv4 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. The shareable configuration (e.g. subnets, shared networks) is not deleted as it may be used by other servers."
+        "This command is used to delete information about a DHCPv4 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. The shareable configuration elements (e.g. subnets, shared networks) are not deleted as they may be used by other servers."
     ],
     "cmd-comment": [
         "This command carries the list including exactly one map with the tag of the server to be deleted."
@@ -26,7 +26,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"1 DHCPv4 server(s) deleted.\"",
+        "    \"text\": \"1 DHCPv4 server(s) deleted.\",",
         "    \"arguments\": {",
         "        \"count\": 1",
         "    }",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/remote-server6-del.json b/doc/sphinx/api/remote-server6-del.json
index 4e1f8798bd..4e7651e813 100644
--- a/doc/sphinx/api/remote-server6-del.json
+++ b/doc/sphinx/api/remote-server6-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete information about a DHCPv6 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. The shareable configuration (e.g. subnets, shared networks) is not deleted as it may be used by other servers."
+        "This command is used to delete information about a DHCPv6 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. The shareable configuration elements (e.g. subnets, shared networks) are not deleted as they may be used by other servers."
     ],
     "cmd-comment": [
         "This command carries the list including exactly one map with the tag of the server to be deleted."
@@ -26,7 +26,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"1 DHCPv6 server(s) deleted.\"",
+        "    \"text\": \"1 DHCPv6 server(s) deleted.\",",
         "    \"arguments\": {",
         "        \"count\": 1",
         "    }",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/remote-subnet4-get-by-id.json b/doc/sphinx/api/remote-subnet4-get-by-id.json
index b5abe31f9b..f14c00e9c2 100644
--- a/doc/sphinx/api/remote-subnet4-get-by-id.json
+++ b/doc/sphinx/api/remote-subnet4-get-by-id.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected IPv4 subnet by ID for the server from the configuration database."
+        "This command is used to fetch the selected IPv4 subnet by ID for the server from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one id of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
+        "This command includes a list with exactly one ID of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-subnet4-get-by-id\"",
+        "    \"command\": \"remote-subnet4-get-by-id\",",
         "    \"arguments\": {",
         "        \"subnets\": [ {",
         "            \"id\": <subnet identifier>",
@@ -22,7 +22,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet4-get-by-id",
     "resp-comment": [
-        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and it provides database specific information associated with the returned object."
+        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet4-get-by-prefix.json b/doc/sphinx/api/remote-subnet4-get-by-prefix.json
index c6093381a0..c3d447c039 100644
--- a/doc/sphinx/api/remote-subnet4-get-by-prefix.json
+++ b/doc/sphinx/api/remote-subnet4-get-by-prefix.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected IPv4 subnet by prefix from the configuration database."
+        "This command is used to fetch the selected IPv4 subnet by prefix from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one prefix of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-subnet4-get-by-prefix\"",
+        "    \"command\": \"remote-subnet4-get-by-prefix\",",
         "    \"arguments\": {",
         "        \"subnets\": [ {",
         "            \"subnet\": <subnet prefix>",
@@ -22,7 +22,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet4-get-by-prefix",
     "resp-comment": [
-        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and it provides database specific information associated with the returned object."
+        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet4-list.json b/doc/sphinx/api/remote-subnet4-list.json
index 256047f06a..fb14d51647 100644
--- a/doc/sphinx/api/remote-subnet4-list.json
+++ b/doc/sphinx/api/remote-subnet4-list.json
@@ -4,11 +4,11 @@
         "This command is used to fetch a list of all IPv4 subnets from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is required for this command. This list must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
+        "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-subnet4-list\"",
+        "    \"command\": \"remote-subnet4-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet4-list",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains a subnet identifier, prefix and shared network name to which the subnet belongs. If the subnet does not belong to a shared netork the name is null. The metadata includes database specific information associated with the subnets. The returned list does not contain full subnet definitions. Use ``remote-subnet4-get`` to fetch the full information about the selected subnets. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all subnets which are associated with any of the specified tags. A subnet is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all subnets which are assigned to no servers (unassigned)."
+        "The returned response contains a list of maps. Each map contains a subnet identifier, prefix, and shared network name to which the subnet belongs. If the subnet does not belong to a shared network, the name is null. The metadata includes database-specific information associated with the subnets. The returned list does not contain full subnet definitions; use ``remote-subnet4-get`` to fetch the full information about the selected subnets. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all subnets which are associated with any of the specified tags. A subnet is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all subnets which are assigned to no servers (unassigned)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet6-get-by-id.json b/doc/sphinx/api/remote-subnet6-get-by-id.json
index 0b992ef256..3d23c7a38c 100644
--- a/doc/sphinx/api/remote-subnet6-get-by-id.json
+++ b/doc/sphinx/api/remote-subnet6-get-by-id.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected IPv6 subnet by ID for the server from the configuration database."
+        "This command is used to fetch the selected IPv6 subnet by ID for the server from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one id of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
+        "This command includes a list with exactly one ID of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-subnet6-get-by-id\"",
+        "    \"command\": \"remote-subnet6-get-by-id\",",
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
@@ -24,7 +24,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet6-get-by-id",
     "resp-comment": [
-        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and it provides database specific information associated with the returned object."
+        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet6-get-by-prefix.json b/doc/sphinx/api/remote-subnet6-get-by-prefix.json
index b79d871cda..6bb16d51cf 100644
--- a/doc/sphinx/api/remote-subnet6-get-by-prefix.json
+++ b/doc/sphinx/api/remote-subnet6-get-by-prefix.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected IPv6 subnet by prefix from the configuration database."
+        "This command is used to fetch the selected IPv6 subnet by prefix from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one prefix of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-subnet4-get-by-prefix\"",
+        "    \"command\": \"remote-subnet6-get-by-prefix\",",
         "    \"arguments\": {",
         "        \"subnets\": [",
         "            {",
@@ -24,7 +24,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet6-get-by-prefix",
     "resp-comment": [
-        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and it provides database specific information associated with the returned object."
+        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet6-list.json b/doc/sphinx/api/remote-subnet6-list.json
index 0e5db5a1f0..b6a82db8d6 100644
--- a/doc/sphinx/api/remote-subnet6-list.json
+++ b/doc/sphinx/api/remote-subnet6-list.json
@@ -4,11 +4,11 @@
         "This command is used to fetch a list of all IPv6 subnets from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is required for this command. This list must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
+        "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-subnet6-list\"",
+        "    \"command\": \"remote-subnet6-list\",",
         "    \"arguments\": {",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet6-list",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains a subnet identifier, prefix and shared network name to which the subnet belongs. If the subnet does not belong to a shared netork the name is null. The metadata includes database specific information associated with the subnets. The returned list does not contain full subnet definitions. Use ``remote-subnet6-get`` to fetch the full information about the selected subnets. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all subnets which are associated with any of the specified tags. A subnet is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all subnets which are assigned to no servers (unassigned)."
+        "The returned response contains a list of maps. Each map contains a subnet identifier, prefix, and shared network name to which the subnet belongs. If the subnet does not belong to a shared network, the name is null. The metadata includes database-specific information associated with the subnets. The returned list does not contain full subnet definitions; use ``remote-subnet6-get`` to fetch the full information about the selected subnets. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all subnets which are associated with any of the specified tags. A subnet is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all subnets which are assigned to no servers (unassigned)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/reservation-get.json b/doc/sphinx/api/reservation-get.json
index e1da525e35..800e2d2a90 100644
--- a/doc/sphinx/api/reservation-get.json
+++ b/doc/sphinx/api/reservation-get.json
@@ -1,17 +1,17 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "Attempts to retrieve an existing host reservation"
+        "This command is used to retrieve an existing host reservation."
     ],
     "cmd-comment": [
-        "The host reservation can be identified by either (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
+        "The host reservation can be identified by either the (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
     ],
     "cmd-syntax": [
         "{",
         "    \"command\": \"reservation-get\",",
         "    \"arguments\": {",
         "        \"subnet-id\": <integer>,",
-        "        \"identifier-type\": <string with one value out of: hw-address|duid|circuit-id|client-id|flex-id>,",
+        "        \"identifier-type\": <one of \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" and \"flex-id\">,",
         "        \"identifier\": <string>;",
         "    }",
         "}"
@@ -19,8 +19,8 @@
     "hook": "host_cmds",
     "name": "reservation-get",
     "resp-comment": [
-        "Arguments object appear only if a host is found. Many fields in the arguments",
-        "object appear only if specific field is set."
+        "The arguments object appears only if a host is found. Many fields in the arguments",
+        "object appear only if a specific field is set."
     ],
     "resp-syntax": [
         "{",
@@ -28,22 +28,22 @@
         "    \"text\": <string>,",
         "    \"arguments\": {",
         "        \"boot-file-name\": <string>,",
-        "        \"comment\": <string>",
+        "        \"comment\": <string>,",
         "        \"client-id\": <string>,",
         "        \"circuit-id\": <string>,",
         "        \"duid\": <string>,",
         "        \"flex-id\": <string>,",
         "        \"ip-address\": <string (IPv4 address)>,",
-        "        \"ip-addresses\": [ <comma separated strings> ],",
+        "        \"ip-addresses\": [ <comma-separated strings> ],",
         "        \"hw-address\": <string>,",
         "        \"hostname\": <string>,",
         "        \"next-server\": <string (IPv4 address)>,",
-        "        \"option-data-list\": [ <comma separated structures defining options> ],",
-        "        \"prefixes\": [ <comma separated IPv6 prefixes> ],",
-        "        \"reservation-client-classes\": [ <comma separated strings> ],",
+        "        \"option-data-list\": [ <comma-separated structures defining options> ],",
+        "        \"prefixes\": [ <comma-separated IPv6 prefixes> ],",
+        "        \"reservation-client-classes\": [ <comma-separated strings> ],",
         "        \"server-hostname\": <string>,",
         "        \"subnet-id\": <integer>,",
-        "        \"user-context\": <any valid JSON>,",
+        "        \"user-context\": <any valid JSON>",
         "    }",
         "}"
     ],
@@ -51,4 +51,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/stat-lease4-get.json b/doc/sphinx/api/stat-lease4-get.json
index d0dc621275..5130d1898b 100644
--- a/doc/sphinx/api/stat-lease4-get.json
+++ b/doc/sphinx/api/stat-lease4-get.json
@@ -1,12 +1,11 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The stat-lease4-get command fetches lease statistics for a range",
-        "of known IPv4 subnets."
+        "This command fetches lease statistics for a range of known IPv4 subnets."
     ],
     "cmd-syntax": [
         "{",
-        "  \"command\": \"stat-lease4-get\"",
+        "  \"command\": \"stat-lease4-get\",",
         "}"
     ],
     "description": "See <xref linkend=\"command-stat-lease4-get\"/>",
@@ -21,7 +20,7 @@
         "        \"columns\": [ \"subnet-id\",",
         "                       \"total-addresses\",",
         "                       \"assigned-addresses\",",
-        "                       \"declined-addresses\" ]",
+        "                       \"declined-addresses\" ],",
         "        \"rows\": [",
         "          [ 10, 256, 111, 0 ],",
         "          [ 20, 4098, 2034, 4 ]",
diff --git a/doc/sphinx/api/stat-lease6-get.json b/doc/sphinx/api/stat-lease6-get.json
index 000f5fd075..bb766ff370 100644
--- a/doc/sphinx/api/stat-lease6-get.json
+++ b/doc/sphinx/api/stat-lease6-get.json
@@ -1,8 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The stat-lease6-get command fetches lease statistics for a range",
-        "of known IPv6 subnets."
+        "This command fetches lease statistics for a range of known IPv6 subnets."
     ],
     "cmd-syntax": [
         "{",
@@ -21,7 +20,7 @@
         "    \"text\": \"stat-lease6-get: 2 rows found\",",
         "    \"arguments\": {",
         "      \"result-set\": {",
-        "        \"columns\": [ \"subnet-id\", \"total-nas\", \"assigned-nas\", \"declined-nas\", \"total-pds\", \"assigned-pds\" ]",
+        "        \"columns\": [ \"subnet-id\", \"total-nas\", \"assigned-nas\", \"declined-nas\", \"total-pds\", \"assigned-pds\" ],",
         "        \"rows\": [",
         "          [ 10, 4096, 2400, 3, 0, 0],",
         "          [ 20, 0, 0, 0, 1048, 233 ]",
diff --git a/doc/sphinx/api/subnet4-get.json b/doc/sphinx/api/subnet4-get.json
index 181f9cef4c..c1b910b7b4 100644
--- a/doc/sphinx/api/subnet4-get.json
+++ b/doc/sphinx/api/subnet4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to retrieve detailed information about the specified subnet. This command usually follows the subnet4-list, which is used to discover available subnets with their respective subnet identifiers and prefixes."
+        "This command is used to retrieve detailed information about the specified subnet. This command usually follows ``subnet4-list``, which is used to discover available subnets with their respective subnet identifiers and prefixes."
     ],
     "cmd-syntax": [
         "{",
@@ -24,7 +24,7 @@
         "                \"subnet\": \"10.0.0.0/8\",",
         "                \"id\": 1,",
         "                \"option-data\": [",
-        "                    ....",
+        "                    ...",
         "                ]",
         "                ...",
         "            }",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet6-get.json b/doc/sphinx/api/subnet6-get.json
index 03c5e77e07..8134135e69 100644
--- a/doc/sphinx/api/subnet6-get.json
+++ b/doc/sphinx/api/subnet6-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to retrieve detailed information about the specified subnet. This command usually follows the subnet6-list, which is used to discover available subnets with their respective subnet identifiers and prefixes."
+        "This command is used to retrieve detailed information about the specified subnet. This command usually follows ``subnet6-list``, which is used to discover available subnets with their respective subnet identifiers and prefixes."
     ],
     "cmd-syntax": [
         "{",
@@ -26,7 +26,7 @@
         "                \"option-data\": [",
         "                    ...",
         "                ]",
-        "                ....",
+        "                ...",
         "            }",
         "        ]",
         "    }",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
-- 
GitLab


From 71ec70431f162ea02b45e141f76b00efa06b3ab7 Mon Sep 17 00:00:00 2001
From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 9 Aug 2019 02:09:41 +0300
Subject: [PATCH 03/13] [#810, !471] fixed sphinx docs

---
 doc/sphinx/api/lease6-bulk-apply.json         | 42 +++++++++----------
 doc/sphinx/api/remote-network4-del.json       |  2 +-
 doc/sphinx/api/remote-network4-get.json       |  2 +-
 doc/sphinx/api/remote-network6-del.json       |  2 +-
 doc/sphinx/api/remote-network6-get.json       |  2 +-
 doc/sphinx/api/remote-option-def4-del.json    |  2 +-
 doc/sphinx/api/remote-option-def6-del.json    |  2 +-
 doc/sphinx/api/remote-option4-global-del.json |  2 +-
 doc/sphinx/api/remote-option4-global-get.json |  1 +
 doc/sphinx/api/remote-option6-global-del.json |  2 +-
 doc/sphinx/api/remote-option6-global-get.json |  1 +
 doc/sphinx/api/remote-server4-get.json        |  4 +-
 doc/sphinx/api/remote-server6-get.json        |  4 +-
 doc/sphinx/api/reservation-add.json           |  4 +-
 doc/sphinx/api/reservation-del.json           |  4 +-
 doc/sphinx/api/reservation-get-all.json       |  3 +-
 doc/sphinx/api/reservation-get.json           |  4 +-
 doc/sphinx/api/stat-lease6-get.json           |  2 +-
 doc/sphinx/api/subnet4-list.json              | 23 +++++-----
 doc/sphinx/api/subnet6-list.json              | 23 +++++-----
 20 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/doc/sphinx/api/lease6-bulk-apply.json b/doc/sphinx/api/lease6-bulk-apply.json
index b9d5363a33..0710fcae30 100644
--- a/doc/sphinx/api/lease6-bulk-apply.json
+++ b/doc/sphinx/api/lease6-bulk-apply.json
@@ -45,28 +45,26 @@
         "The \"failed-deleted-leases\" holds the list of leases which failed to delete. This includes leases which were not found in the database. The \"failed-leases\" includes the list of leases which failed to create or update. For each lease for which there was an error during processing, inserting it into the database, etc., the result is set to 1. For each lease which was not deleted because the server did not find it in the database, the result of 3 is returned."
     ],
     "resp-syntax": [
-        " {",
-        "    {",
-        "        \"result\": 0,",
-        "        \"text\": \"IPv6 leases bulk apply completed.\",",
-        "        \"arguments\": {",
-        "            \"failed-deleted-leases\": [",
-        "                {",
-        "                    \"ip-address\": \"2001:db8:abcd::\",",
-        "                    \"type\": \"IA_PD\",",
-        "                    \"result\": <control result>,",
-        "                    \"error-message\": <error message>",
-        "                }",
-        "            ],",
-        "            \"failed-leases\": [",
-        "                {",
-        "                    \"ip-address\": \"2001:db8:cafe::\",",
-        "                    \"type\": \"IA_PD\",",
-        "                    \"result\": <control result>,",
-        "                    \"error-message\": <error message>",
-        "                }",
-        "            ]",
-        "        }",
+        "{",
+        "    \"result\": 0,",
+        "    \"text\": \"IPv6 leases bulk apply completed.\",",
+        "    \"arguments\": {",
+        "        \"failed-deleted-leases\": [",
+        "            {",
+        "                \"ip-address\": \"2001:db8:abcd::\",",
+        "                \"type\": \"IA_PD\",",
+        "                \"result\": <control result>,",
+        "                \"error-message\": <error message>",
+        "            }",
+        "        ],",
+        "        \"failed-leases\": [",
+        "            {",
+        "                \"ip-address\": \"2001:db8:cafe::\",",
+        "                \"type\": \"IA_PD\",",
+        "                \"result\": <control result>,",
+        "                \"error-message\": <error message>",
+        "            }",
+        "        ]",
         "    }",
         "}"
     ],
diff --git a/doc/sphinx/api/remote-network4-del.json b/doc/sphinx/api/remote-network4-del.json
index 5721162e80..6aee9e2dca 100644
--- a/doc/sphinx/api/remote-network4-del.json
+++ b/doc/sphinx/api/remote-network4-del.json
@@ -15,7 +15,7 @@
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-action\": '<'keep' | 'delete'>',",
+        "        \"subnets-action\": <'keep' | 'delete'>,",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
diff --git a/doc/sphinx/api/remote-network4-get.json b/doc/sphinx/api/remote-network4-get.json
index ece2780e08..6ae0e5bdd2 100644
--- a/doc/sphinx/api/remote-network4-get.json
+++ b/doc/sphinx/api/remote-network4-get.json
@@ -15,7 +15,7 @@
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-include\": \"full\" | \"no\",",
+        "        \"subnets-include\": <'full' | 'no'>,",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
diff --git a/doc/sphinx/api/remote-network6-del.json b/doc/sphinx/api/remote-network6-del.json
index db43e100d9..402911c59f 100644
--- a/doc/sphinx/api/remote-network6-del.json
+++ b/doc/sphinx/api/remote-network6-del.json
@@ -15,7 +15,7 @@
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-action\": \"keep\" | \"delete\",",
+        "        \"subnets-action\": <'keep' | 'delete'>,",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
diff --git a/doc/sphinx/api/remote-network6-get.json b/doc/sphinx/api/remote-network6-get.json
index 9264e8c687..eee9257cc5 100644
--- a/doc/sphinx/api/remote-network6-get.json
+++ b/doc/sphinx/api/remote-network6-get.json
@@ -15,7 +15,7 @@
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-include\": \"full\" | \"no\",",
+        "        \"subnets-include\": <'full' | 'no'>,",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
diff --git a/doc/sphinx/api/remote-option-def4-del.json b/doc/sphinx/api/remote-option-def4-del.json
index 6ac87975f2..fe704c9b84 100644
--- a/doc/sphinx/api/remote-option-def4-del.json
+++ b/doc/sphinx/api/remote-option-def4-del.json
@@ -12,7 +12,7 @@
         "    \"arguments\": {",
         "        \"option-defs\": [ {",
         "            \"code\": <option code>,",
-        "            \"space\": <option space",
+        "            \"space\": <option space>",
         "        } ],",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
diff --git a/doc/sphinx/api/remote-option-def6-del.json b/doc/sphinx/api/remote-option-def6-del.json
index 6ad13ddd0a..b4b393d9d1 100644
--- a/doc/sphinx/api/remote-option-def6-del.json
+++ b/doc/sphinx/api/remote-option-def6-del.json
@@ -12,7 +12,7 @@
         "    \"arguments\": {",
         "        \"option-defs\": [ {",
         "            \"code\": <option code>,",
-        "            \"space\": <option space",
+        "            \"space\": <option space>",
         "        } ],",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
diff --git a/doc/sphinx/api/remote-option4-global-del.json b/doc/sphinx/api/remote-option4-global-del.json
index eae0be3961..e88b659823 100644
--- a/doc/sphinx/api/remote-option4-global-del.json
+++ b/doc/sphinx/api/remote-option4-global-del.json
@@ -13,7 +13,7 @@
         "        \"options\": [",
         "            {",
         "                \"code\": <option code>,",
-        "                \"space\": <option space>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
diff --git a/doc/sphinx/api/remote-option4-global-get.json b/doc/sphinx/api/remote-option4-global-get.json
index 09c4ac5e75..6be271d484 100644
--- a/doc/sphinx/api/remote-option4-global-get.json
+++ b/doc/sphinx/api/remote-option4-global-get.json
@@ -20,6 +20,7 @@
         "            <specification of the database to connect to>",
         "        },",
         "        \"server-tags\": [ <single server tag as string> ]",
+        "    }",
         "}"
     ],
     "hook": "cb_cmds",
diff --git a/doc/sphinx/api/remote-option6-global-del.json b/doc/sphinx/api/remote-option6-global-del.json
index ac9afa1a6c..472543ef72 100644
--- a/doc/sphinx/api/remote-option6-global-del.json
+++ b/doc/sphinx/api/remote-option6-global-del.json
@@ -13,7 +13,7 @@
         "        \"options\": [",
         "            {",
         "                \"code\": <option code>,",
-        "                \"space\": <option space>,",
+        "                \"space\": <option space>",
         "            }",
         "        ],",
         "        \"remote\": {",
diff --git a/doc/sphinx/api/remote-option6-global-get.json b/doc/sphinx/api/remote-option6-global-get.json
index 48354b7eab..a0a2b9335e 100644
--- a/doc/sphinx/api/remote-option6-global-get.json
+++ b/doc/sphinx/api/remote-option6-global-get.json
@@ -20,6 +20,7 @@
         "            <specification of the database to connect to>",
         "        },",
         "        \"server-tags\": [ <single server tag as string> ]",
+        "    }"
         "}"
     ],
     "hook": "cb_cmds",
diff --git a/doc/sphinx/api/remote-server4-get.json b/doc/sphinx/api/remote-server4-get.json
index d9a0bfce24..b83cdf5373 100644
--- a/doc/sphinx/api/remote-server4-get.json
+++ b/doc/sphinx/api/remote-server4-get.json
@@ -29,7 +29,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"DHCP server <server tag> found.\",",
+        "    \"text\": \"DHCP server 'server tag' found.\",",
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
@@ -44,4 +44,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/remote-server6-get.json b/doc/sphinx/api/remote-server6-get.json
index 3030b0b7f4..76d58e6af9 100644
--- a/doc/sphinx/api/remote-server6-get.json
+++ b/doc/sphinx/api/remote-server6-get.json
@@ -29,7 +29,7 @@
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"DHCP server <server tag> found.\",",
+        "    \"text\": \"DHCP server 'server tag' found.\",",
         "    \"arguments\": {",
         "        \"servers\": [",
         "            {",
@@ -44,4 +44,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/reservation-add.json b/doc/sphinx/api/reservation-add.json
index fb3c11e791..bd7ab5ef4c 100644
--- a/doc/sphinx/api/reservation-add.json
+++ b/doc/sphinx/api/reservation-add.json
@@ -17,7 +17,7 @@
         "    \"arguments\": {",
         "        \"reservation\": {",
         "            \"boot-file-name\": <string>,",
-        "            \"comment\": <string>",
+        "            \"comment\": <string>,",
         "            \"client-id\": <string>,",
         "            \"circuit-id\": <string>,",
         "            \"duid\": <string>,",
@@ -32,7 +32,7 @@
         "            \"reservation-client-classes\": [ <comma separated strings> ],",
         "            \"server-hostname\": <string>,",
         "            \"subnet-id\": <integer>,",
-        "            \"user-context\": <any valid JSON>,",
+        "            \"user-context\": <any valid JSON>",
         "        }",
         "    }",
         "}"
diff --git a/doc/sphinx/api/reservation-del.json b/doc/sphinx/api/reservation-del.json
index 20861cbe3a..9316865d92 100644
--- a/doc/sphinx/api/reservation-del.json
+++ b/doc/sphinx/api/reservation-del.json
@@ -12,7 +12,7 @@
         "    \"arguments\": {",
         "        \"subnet-id\": <integer>,",
         "        \"ip-address\": <string>,",
-        "        \"identifier-type\": <one of \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" and \"flex-id\">,",
+        "        \"identifier-type\": <one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>,",
         "        \"identifier\": <string>",
         "    }",
         "}"
@@ -23,4 +23,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/reservation-get-all.json b/doc/sphinx/api/reservation-get-all.json
index a45d515b40..af55a40773 100644
--- a/doc/sphinx/api/reservation-get-all.json
+++ b/doc/sphinx/api/reservation-get-all.json
@@ -8,6 +8,7 @@
         "    \"command\": \"reservation-get-all\",",
         "    \"arguments\": {",
         "        \"subnet-id\": <integer>",
+        "    }"
         "}"
     ],
     "hook": "host_cmds",
@@ -19,4 +20,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/reservation-get.json b/doc/sphinx/api/reservation-get.json
index 800e2d2a90..78c681d34e 100644
--- a/doc/sphinx/api/reservation-get.json
+++ b/doc/sphinx/api/reservation-get.json
@@ -11,8 +11,8 @@
         "    \"command\": \"reservation-get\",",
         "    \"arguments\": {",
         "        \"subnet-id\": <integer>,",
-        "        \"identifier-type\": <one of \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" and \"flex-id\">,",
-        "        \"identifier\": <string>;",
+        "        \"identifier-type\": <one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>,",
+        "        \"identifier\": <string>",
         "    }",
         "}"
     ],
diff --git a/doc/sphinx/api/stat-lease6-get.json b/doc/sphinx/api/stat-lease6-get.json
index bb766ff370..9c2a430918 100644
--- a/doc/sphinx/api/stat-lease6-get.json
+++ b/doc/sphinx/api/stat-lease6-get.json
@@ -23,7 +23,7 @@
         "        \"columns\": [ \"subnet-id\", \"total-nas\", \"assigned-nas\", \"declined-nas\", \"total-pds\", \"assigned-pds\" ],",
         "        \"rows\": [",
         "          [ 10, 4096, 2400, 3, 0, 0],",
-        "          [ 20, 0, 0, 0, 1048, 233 ]",
+        "          [ 20, 0, 0, 0, 1048, 233 ],",
         "          [ 30, 256, 60, 0, 1048, 15 ]",
         "        ],",
         "      \"timestamp\": \"2018-05-04 15:03:37.000000\"",
diff --git a/doc/sphinx/api/subnet4-list.json b/doc/sphinx/api/subnet4-list.json
index 2184436e08..bd15914d9e 100644
--- a/doc/sphinx/api/subnet4-list.json
+++ b/doc/sphinx/api/subnet4-list.json
@@ -19,19 +19,20 @@
         "    \"result\": 0,",
         "    \"text\": \"2 IPv4 subnets found\",",
         "    \"arguments\": {",
-        "    \"subnets\": [",
-        "        {",
-        "            \"id\": 10,",
-        "            \"subnet\": \"10.0.0.0/8\"",
-        "        },",
-        "        {",
-        "            \"id\": 100,",
-        "            \"subnet\": \"192.0.2.0/24\"",
-        "        }",
-        "    ]",
+        "        \"subnets\": [",
+        "            {",
+        "                \"id\": 10,",
+        "                \"subnet\": \"10.0.0.0/8\"",
+        "            },",
+        "            {",
+        "                \"id\": 100,",
+        "                \"subnet\": \"192.0.2.0/24\"",
+        "            }",
+        "        ]",
+        "    }",
         "}"
     ],
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet6-list.json b/doc/sphinx/api/subnet6-list.json
index f32937ac85..2e5482a9d3 100644
--- a/doc/sphinx/api/subnet6-list.json
+++ b/doc/sphinx/api/subnet6-list.json
@@ -19,19 +19,20 @@
         "    \"result\": 0,",
         "    \"text\": \"2 IPv6 subnets found\",",
         "    \"arguments\": {",
-        "    \"subnets\": [",
-        "        {",
-        "            \"id\": 11,",
-        "            \"subnet\": \"2001:db8:1::/64\"",
-        "        },",
-        "        {",
-        "            \"id\": 233,",
-        "            \"subnet\": \"3000::/16\"",
-        "        }",
-        "    ]",
+        "        \"subnets\": [",
+        "            {",
+        "                \"id\": 11,",
+        "                \"subnet\": \"2001:db8:1::/64\"",
+        "            },",
+        "            {",
+        "                \"id\": 233,",
+        "                \"subnet\": \"3000::/16\"",
+        "            }",
+        "        ]",
+        "    }",
         "}"
     ],
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
-- 
GitLab


From 32d39537049a2ad1060b1e35855cc78a78cc1aa9 Mon Sep 17 00:00:00 2001
From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 9 Aug 2019 02:25:41 +0300
Subject: [PATCH 04/13] [#810, !471] fixed sphinx docs

---
 doc/sphinx/api/stat-lease4-get.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/sphinx/api/stat-lease4-get.json b/doc/sphinx/api/stat-lease4-get.json
index 5130d1898b..7ddef1a2b0 100644
--- a/doc/sphinx/api/stat-lease4-get.json
+++ b/doc/sphinx/api/stat-lease4-get.json
@@ -5,7 +5,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "  \"command\": \"stat-lease4-get\",",
+        "  \"command\": \"stat-lease4-get\"",
         "}"
     ],
     "description": "See <xref linkend=\"command-stat-lease4-get\"/>",
-- 
GitLab


From fceb85995ea3a1ab1fccd5172b086aeb79fad522 Mon Sep 17 00:00:00 2001
From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 9 Aug 2019 09:46:38 +0300
Subject: [PATCH 05/13] [#810, !471] fixed sphinx docs

---
 doc/sphinx/api/class-del.json                            | 2 +-
 doc/sphinx/api/class-update.json                         | 2 +-
 doc/sphinx/api/remote-global-parameter4-get.json         | 2 +-
 doc/sphinx/api/remote-global-parameter6-get.json         | 2 +-
 doc/sphinx/api/remote-network4-list.json                 | 2 +-
 doc/sphinx/api/remote-network6-list.json                 | 2 +-
 doc/sphinx/api/remote-option-def4-del.json               | 2 +-
 doc/sphinx/api/remote-option-def6-del.json               | 2 +-
 doc/sphinx/api/remote-subnet4-del-by-id.json             | 2 +-
 doc/sphinx/api/remote-subnet6-del-by-id.json             | 2 +-
 doc/sphinx/api/reservation-del.json                      | 2 +-
 src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc | 2 +-
 src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc | 2 +-
 tools/sysrepo_config                                     | 6 ++----
 14 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json
index 069952392a..86852122c1 100644
--- a/doc/sphinx/api/class-del.json
+++ b/doc/sphinx/api/class-del.json
@@ -16,7 +16,7 @@
     "name": "class-del",
     "resp-comment": [
         "The command will return a result of 3 (empty) if the client",
-        "class doesn't exist. If the client class exists, the retured",
+        "class doesn't exist. If the client class exists, the returned",
         "result is 0 if the deletion was successful and the result is 1",
         "if the deletion is unsuccessful."
     ],
diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json
index 0cea24e0c3..f8fce814f4 100644
--- a/doc/sphinx/api/class-update.json
+++ b/doc/sphinx/api/class-update.json
@@ -30,7 +30,7 @@
     "resp-comment": [
         "The command will return the result of 3 (empty) if the client",
         "class doesn't exist. If the client class exists, the returned",
-        "result is 0 if the update was successful; the result is 1",
+        "result is 0 if the update was successful and the result is 1",
         "if the update is unsuccessful."
     ],
     "resp-syntax": [
diff --git a/doc/sphinx/api/remote-global-parameter4-get.json b/doc/sphinx/api/remote-global-parameter4-get.json
index 219ccd766f..cacdd2780e 100644
--- a/doc/sphinx/api/remote-global-parameter4-get.json
+++ b/doc/sphinx/api/remote-global-parameter4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected global parameter for the server from the specified database."
+        "This command is used to fetch the selected global parameter for the server from the specified database."
     ],
     "cmd-comment": [
         "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global parameter value shared by all servers."
diff --git a/doc/sphinx/api/remote-global-parameter6-get.json b/doc/sphinx/api/remote-global-parameter6-get.json
index 69a17d6b28..7a38fe1857 100644
--- a/doc/sphinx/api/remote-global-parameter6-get.json
+++ b/doc/sphinx/api/remote-global-parameter6-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected global parameter for the server from the specified database."
+        "This command is used to fetch the selected global parameter for the server from the specified database."
     ],
     "cmd-comment": [
         "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global parameter value shared by all servers."
diff --git a/doc/sphinx/api/remote-network4-list.json b/doc/sphinx/api/remote-network4-list.json
index bc45c27a6c..bafbdb0654 100644
--- a/doc/sphinx/api/remote-network4-list.json
+++ b/doc/sphinx/api/remote-network4-list.json
@@ -4,7 +4,7 @@
         "This command is used to fetch a list of all IPv4 shared networks from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is required for this command. This list must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
+        "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-list.json b/doc/sphinx/api/remote-network6-list.json
index a1d7d238dc..00727d2533 100644
--- a/doc/sphinx/api/remote-network6-list.json
+++ b/doc/sphinx/api/remote-network6-list.json
@@ -4,7 +4,7 @@
         "This command is used to fetch a list of all IPv6 shared networks from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is required for this command. This list must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
+        "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-del.json b/doc/sphinx/api/remote-option-def4-del.json
index fe704c9b84..7daaf995cb 100644
--- a/doc/sphinx/api/remote-option-def4-del.json
+++ b/doc/sphinx/api/remote-option-def4-del.json
@@ -4,7 +4,7 @@
         "This command is used to delete a DHCPv4 option definition from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one option definition specification comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+        "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-del.json b/doc/sphinx/api/remote-option-def6-del.json
index b4b393d9d1..516ca103b3 100644
--- a/doc/sphinx/api/remote-option-def6-del.json
+++ b/doc/sphinx/api/remote-option-def6-del.json
@@ -4,7 +4,7 @@
         "This command is used to delete a DHCPv6 option definition from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one option definition specification comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+        "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet4-del-by-id.json b/doc/sphinx/api/remote-subnet4-del-by-id.json
index e54309dc55..7c3b6c3c80 100644
--- a/doc/sphinx/api/remote-subnet4-del-by-id.json
+++ b/doc/sphinx/api/remote-subnet4-del-by-id.json
@@ -4,7 +4,7 @@
         "This command is used to delete an IPv4 subnet by ID from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one id of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
+        "This command includes a list with exactly one ID of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet6-del-by-id.json b/doc/sphinx/api/remote-subnet6-del-by-id.json
index 367fd07e07..83c704cd65 100644
--- a/doc/sphinx/api/remote-subnet6-del-by-id.json
+++ b/doc/sphinx/api/remote-subnet6-del-by-id.json
@@ -4,7 +4,7 @@
         "This command is used to delete an IPv6 subnet by ID from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one id of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
+        "This command includes a list with exactly one ID of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/reservation-del.json b/doc/sphinx/api/reservation-del.json
index 9316865d92..4c4ab6f1a2 100644
--- a/doc/sphinx/api/reservation-del.json
+++ b/doc/sphinx/api/reservation-del.json
@@ -4,7 +4,7 @@
         "Deletes an existing host reservation."
     ],
     "cmd-comment": [
-        "The host reservation can be identified by either (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
+        "The host reservation can be identified by either the (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
     ],
     "cmd-syntax": [
         "{",
diff --git a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
index c1fd8bc980..b37ac81760 100644
--- a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
@@ -277,7 +277,7 @@ TEST(MySqlConnection, checkTimeConversion) {
 }
 
 // This test verifies that database backend can operate in Read-Only mode.
-TEST_F(MySqlHostDataSourceTest, testReadOnlyDatabase) {
+TEST_F(MySqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) {
     testReadOnlyDatabase(MYSQL_VALID_TYPE);
 }
 
diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
index 1925d7eedc..69231977d7 100644
--- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
@@ -263,7 +263,7 @@ TEST(PgSqlHostDataSource, NoCallbackOnOpenFail) {
 }
 
 // This test verifies that database backend can operate in Read-Only mode.
-TEST_F(PgSqlHostDataSourceTest, testReadOnlyDatabase) {
+TEST_F(PgSqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) {
     testReadOnlyDatabase(PGSQL_VALID_TYPE);
 }
 
diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index fd28a86a46..ba15afe5a8 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -78,10 +78,8 @@ if [ "$1" = "--libs" ]; then
 fi
 
 if [ "$1" = "--modversion" ]; then
-    MAJOR="1"
-    MINOR="0"
-    PATCH="0"
-    echo "${MAJOR}.${MINOR}.${PATCH}"
+    VERSION=$(sysrepoctl -v | tr -s " " | cut -d " " -f 7)
+    echo "${VERSION}"
     exit 0
 fi
 
-- 
GitLab


From 581948124b07bed6244bf773c1e3eb7525d28749 Mon Sep 17 00:00:00 2001
From: Razvan Becheriu <razvan@isc.org>
Date: Fri, 9 Aug 2019 09:59:16 +0300
Subject: [PATCH 06/13] [#810, !471] reverted changes added by mistake

---
 src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc | 2 +-
 src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc | 2 +-
 tools/sysrepo_config                                     | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
index b37ac81760..c1fd8bc980 100644
--- a/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
@@ -277,7 +277,7 @@ TEST(MySqlConnection, checkTimeConversion) {
 }
 
 // This test verifies that database backend can operate in Read-Only mode.
-TEST_F(MySqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) {
+TEST_F(MySqlHostDataSourceTest, testReadOnlyDatabase) {
     testReadOnlyDatabase(MYSQL_VALID_TYPE);
 }
 
diff --git a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
index 69231977d7..1925d7eedc 100644
--- a/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
@@ -263,7 +263,7 @@ TEST(PgSqlHostDataSource, NoCallbackOnOpenFail) {
 }
 
 // This test verifies that database backend can operate in Read-Only mode.
-TEST_F(PgSqlHostDataSourceTest, DISABLED_testReadOnlyDatabase) {
+TEST_F(PgSqlHostDataSourceTest, testReadOnlyDatabase) {
     testReadOnlyDatabase(PGSQL_VALID_TYPE);
 }
 
diff --git a/tools/sysrepo_config b/tools/sysrepo_config
index ba15afe5a8..fd28a86a46 100755
--- a/tools/sysrepo_config
+++ b/tools/sysrepo_config
@@ -78,8 +78,10 @@ if [ "$1" = "--libs" ]; then
 fi
 
 if [ "$1" = "--modversion" ]; then
-    VERSION=$(sysrepoctl -v | tr -s " " | cut -d " " -f 7)
-    echo "${VERSION}"
+    MAJOR="1"
+    MINOR="0"
+    PATCH="0"
+    echo "${MAJOR}.${MINOR}.${PATCH}"
     exit 0
 fi
 
-- 
GitLab


From cb4a21545ff17350e64f234ea67107eda7ecad40 Mon Sep 17 00:00:00 2001
From: Suzanne Goldlust <sgoldlust@isc.org>
Date: Fri, 9 Aug 2019 17:16:47 -0400
Subject: [PATCH 07/13] Fix grammar, typos, a few JSON errors

---
 doc/sphinx/api/build-report.json                |  6 +++---
 doc/sphinx/api/cache-get-by-id.json             |  2 +-
 doc/sphinx/api/cache-get.json                   |  2 +-
 doc/sphinx/api/cache-insert.json                |  2 +-
 doc/sphinx/api/cache-load.json                  |  4 ++--
 doc/sphinx/api/cache-remove.json                |  6 +++---
 doc/sphinx/api/cache-size.json                  |  2 +-
 doc/sphinx/api/cache-write.json                 |  6 +++---
 doc/sphinx/api/class-add.json                   |  9 +++------
 doc/sphinx/api/class-del.json                   |  6 +++++-
 doc/sphinx/api/class-get.json                   | 13 +++----------
 doc/sphinx/api/class-list.json                  |  5 ++---
 doc/sphinx/api/class-update.json                | 10 ++++++----
 doc/sphinx/api/config-get.json                  |  4 +---
 doc/sphinx/api/config-reload.json               |  4 ++--
 doc/sphinx/api/config-set.json                  |  4 ++--
 doc/sphinx/api/config-test.json                 |  4 ++--
 doc/sphinx/api/config-write.json                |  2 +-
 doc/sphinx/api/dhcp-disable.json                |  4 ++--
 doc/sphinx/api/dhcp-enable.json                 |  6 +++---
 doc/sphinx/api/ha-continue.json                 |  6 +++---
 doc/sphinx/api/ha-heartbeat.json                |  3 +--
 doc/sphinx/api/ha-scopes.json                   |  2 +-
 doc/sphinx/api/ha-sync.json                     |  3 +--
 doc/sphinx/api/lease4-add.json                  |  4 ++--
 doc/sphinx/api/lease4-del.json                  |  6 +++---
 doc/sphinx/api/lease4-get-all.json              |  4 ++--
 doc/sphinx/api/lease4-get.json                  |  6 +++---
 doc/sphinx/api/lease4-update.json               |  4 ++--
 doc/sphinx/api/lease4-wipe.json                 |  2 +-
 doc/sphinx/api/lease6-add.json                  |  4 ++--
 doc/sphinx/api/lease6-bulk-apply.json           |  6 +++---
 doc/sphinx/api/lease6-del.json                  |  6 +++---
 doc/sphinx/api/lease6-get-all.json              |  4 ++--
 doc/sphinx/api/lease6-get.json                  |  6 +++---
 doc/sphinx/api/lease6-update.json               |  4 ++--
 doc/sphinx/api/lease6-wipe.json                 |  4 ++--
 doc/sphinx/api/leases-reclaim.json              |  4 ++--
 doc/sphinx/api/libreload.json                   |  6 +++---
 doc/sphinx/api/list-commands.json               |  6 +++---
 doc/sphinx/api/network4-add.json                |  4 ++--
 doc/sphinx/api/network4-del.json                |  4 ++--
 doc/sphinx/api/network4-get.json                |  6 +++---
 doc/sphinx/api/network4-list.json               |  4 ++--
 doc/sphinx/api/network4-subnet-add.json         |  4 ++--
 doc/sphinx/api/network4-subnet-del.json         |  4 ++--
 doc/sphinx/api/network6-add.json                |  6 +++---
 doc/sphinx/api/network6-del.json                |  6 +++---
 doc/sphinx/api/network6-get.json                |  2 +-
 doc/sphinx/api/network6-list.json               |  6 +++---
 doc/sphinx/api/network6-subnet-add.json         |  6 +++---
 doc/sphinx/api/network6-subnet-del.json         |  6 +++---
 .../api/remote-global-parameter4-del.json       |  4 ++--
 .../api/remote-global-parameter4-get-all.json   |  6 +++---
 .../api/remote-global-parameter4-get.json       |  8 ++++++--
 .../api/remote-global-parameter4-set.json       |  4 ++--
 .../api/remote-global-parameter6-del.json       |  4 ++--
 .../api/remote-global-parameter6-get-all.json   |  6 +++---
 .../api/remote-global-parameter6-get.json       |  8 ++++++--
 .../api/remote-global-parameter6-set.json       |  4 ++--
 doc/sphinx/api/remote-network4-del.json         |  4 ++--
 doc/sphinx/api/remote-network4-get.json         |  2 +-
 doc/sphinx/api/remote-network4-list.json        |  8 ++++++--
 doc/sphinx/api/remote-network4-set.json         |  4 ++--
 doc/sphinx/api/remote-network6-del.json         |  4 ++--
 doc/sphinx/api/remote-network6-get.json         |  2 +-
 doc/sphinx/api/remote-network6-list.json        |  8 ++++++--
 doc/sphinx/api/remote-network6-set.json         |  4 ++--
 doc/sphinx/api/remote-option-def4-del.json      |  6 +++++-
 doc/sphinx/api/remote-option-def4-get-all.json  |  4 ++--
 doc/sphinx/api/remote-option-def4-get.json      |  6 +++---
 doc/sphinx/api/remote-option-def4-set.json      |  4 ++--
 doc/sphinx/api/remote-option-def6-del.json      |  6 +++++-
 doc/sphinx/api/remote-option-def6-get-all.json  |  4 ++--
 doc/sphinx/api/remote-option-def6-get.json      |  6 +++---
 doc/sphinx/api/remote-option-def6-set.json      |  4 ++--
 doc/sphinx/api/remote-option4-global-del.json   |  2 +-
 .../api/remote-option4-global-get-all.json      |  6 +++---
 doc/sphinx/api/remote-option4-global-get.json   |  8 ++++----
 doc/sphinx/api/remote-option4-global-set.json   |  4 ++--
 doc/sphinx/api/remote-option6-global-del.json   |  2 +-
 .../api/remote-option6-global-get-all.json      |  6 +++---
 doc/sphinx/api/remote-option6-global-get.json   |  8 ++++----
 doc/sphinx/api/remote-option6-global-set.json   |  4 ++--
 doc/sphinx/api/remote-server4-del.json          |  2 +-
 doc/sphinx/api/remote-server4-get-all.json      |  4 ++--
 doc/sphinx/api/remote-server4-get.json          |  2 +-
 doc/sphinx/api/remote-server4-set.json          |  4 ++--
 doc/sphinx/api/remote-server6-del.json          |  2 +-
 doc/sphinx/api/remote-server6-get-all.json      |  4 ++--
 doc/sphinx/api/remote-server6-get.json          |  2 +-
 doc/sphinx/api/remote-server6-set.json          |  4 ++--
 doc/sphinx/api/remote-subnet4-del-by-id.json    |  2 +-
 .../api/remote-subnet4-del-by-prefix.json       |  2 +-
 doc/sphinx/api/remote-subnet4-get-by-id.json    |  4 ++--
 .../api/remote-subnet4-get-by-prefix.json       |  2 +-
 doc/sphinx/api/remote-subnet4-list.json         |  2 +-
 doc/sphinx/api/remote-subnet4-set.json          |  4 ++--
 doc/sphinx/api/remote-subnet6-del-by-id.json    |  2 +-
 .../api/remote-subnet6-del-by-prefix.json       |  2 +-
 doc/sphinx/api/remote-subnet6-get-by-id.json    |  4 ++--
 .../api/remote-subnet6-get-by-prefix.json       |  2 +-
 doc/sphinx/api/remote-subnet6-list.json         |  2 +-
 doc/sphinx/api/remote-subnet6-set.json          |  4 ++--
 doc/sphinx/api/reservation-add.json             | 17 ++++++-----------
 doc/sphinx/api/reservation-del.json             |  2 +-
 doc/sphinx/api/reservation-get-all.json         |  4 ++--
 doc/sphinx/api/reservation-get-page.json        |  6 +++---
 doc/sphinx/api/reservation-get.json             |  5 ++---
 doc/sphinx/api/server-tag-get.json              |  4 ++--
 doc/sphinx/api/shutdown.json                    |  5 ++---
 doc/sphinx/api/statistic-get-all.json           |  4 ++--
 doc/sphinx/api/statistic-get.json               |  4 ++--
 doc/sphinx/api/statistic-remove-all.json        |  6 +++---
 doc/sphinx/api/statistic-remove.json            |  6 +++---
 doc/sphinx/api/statistic-reset-all.json         |  6 +++---
 doc/sphinx/api/statistic-reset.json             |  6 +++---
 .../api/statistic-sample-age-set-all.json       |  6 +++---
 doc/sphinx/api/statistic-sample-age-set.json    |  6 +++---
 .../api/statistic-sample-count-set-all.json     |  6 +++---
 doc/sphinx/api/statistic-sample-count-set.json  |  6 +++---
 doc/sphinx/api/subnet4-add.json                 |  4 ++--
 doc/sphinx/api/subnet4-del.json                 |  4 ++--
 doc/sphinx/api/subnet4-get.json                 |  4 ++--
 doc/sphinx/api/subnet4-list.json                |  2 +-
 doc/sphinx/api/subnet4-update.json              |  4 ++--
 doc/sphinx/api/subnet6-add.json                 |  4 ++--
 doc/sphinx/api/subnet6-del.json                 |  4 ++--
 doc/sphinx/api/subnet6-get.json                 |  4 ++--
 doc/sphinx/api/subnet6-list.json                |  2 +-
 doc/sphinx/api/subnet6-update.json              |  4 ++--
 doc/sphinx/api/version-get.json                 |  4 +---
 132 files changed, 305 insertions(+), 299 deletions(-)

diff --git a/doc/sphinx/api/build-report.json b/doc/sphinx/api/build-report.json
index fb3d25f457..39ed952075 100644
--- a/doc/sphinx/api/build-report.json
+++ b/doc/sphinx/api/build-report.json
@@ -1,11 +1,11 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "Returns a list of compilation options that this particular binary was built with"
+        "This command returns the list of compilation options that this particular binary was built with."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"build-report\"",
+        "    \"command\": \"build-report\",",
         "}"
     ],
     "name": "build-report",
@@ -24,4 +24,4 @@
         "kea-dhcp-ddns",
         "kea-ctrl-agent"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-get-by-id.json b/doc/sphinx/api/cache-get-by-id.json
index 91d5160a8a..14c0b454ab 100644
--- a/doc/sphinx/api/cache-get-by-id.json
+++ b/doc/sphinx/api/cache-get-by-id.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Returns entries matching the given identifier from the host cache."
+        "This command returns entries matching the given identifier from the host cache."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/cache-get.json b/doc/sphinx/api/cache-get.json
index af8b020180..b7af01d0f2 100644
--- a/doc/sphinx/api/cache-get.json
+++ b/doc/sphinx/api/cache-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "Returns full content of the host cache."
+        "This command returns the full content of the host cache."
     ],
     "hook": "host_cache",
     "name": "cache-get",
diff --git a/doc/sphinx/api/cache-insert.json b/doc/sphinx/api/cache-insert.json
index c8354e910e..2cf5db5d47 100644
--- a/doc/sphinx/api/cache-insert.json
+++ b/doc/sphinx/api/cache-insert.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command may be used to manually insert a host into the cache."
+        "This command manually inserts a host into the cache."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/cache-load.json b/doc/sphinx/api/cache-load.json
index 823a471f4a..3932dac9fc 100644
--- a/doc/sphinx/api/cache-load.json
+++ b/doc/sphinx/api/cache-load.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command allows load the contents of a file on disk into an in-memory cache."
+        "This command allows the contents of a file on disk to be loaded into an in-memory cache."
     ],
     "cmd-syntax": [
         "{",
@@ -16,4 +16,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-remove.json b/doc/sphinx/api/cache-remove.json
index c3ad0f644a..b824647f05 100644
--- a/doc/sphinx/api/cache-remove.json
+++ b/doc/sphinx/api/cache-remove.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The cache-remove command works similarly to reservation-get command."
+        "This command works similarly to the ``reservation-get`` command."
     ],
     "cmd-syntax": [
         "{",
@@ -12,7 +12,7 @@
         "    }",
         "}",
         "",
-        "Another example that removes IPv6 host identifier by DUID and specific subnet-id is:",
+        "Another example that removes the IPv6 host identifier by DUID and specific subnet-id is:",
         "{",
         "    \"command\": \"cache-remove\",",
         "    \"arguments\": {",
@@ -28,4 +28,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-size.json b/doc/sphinx/api/cache-size.json
index c7e227147c..48681fcd0d 100644
--- a/doc/sphinx/api/cache-size.json
+++ b/doc/sphinx/api/cache-size.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Returns the number of entries in the host cache."
+        "This command returns the number of entries in the host cache."
     ],
     "hook": "host_cache",
     "name": "cache-size",
diff --git a/doc/sphinx/api/cache-write.json b/doc/sphinx/api/cache-write.json
index baa015f4f8..6c8c15b41b 100644
--- a/doc/sphinx/api/cache-write.json
+++ b/doc/sphinx/api/cache-write.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "Instructs Kea to write its host cache content to disk."
+        "This command instructs Kea to write its host cache content to disk."
     ],
     "cmd-comment": [
-        "The command takes one mandatory argument that specifies a filename path of a file to be written."
+        "The command takes one mandatory argument that specifies the filename path of a file to be written."
     ],
     "cmd-syntax": [
         "{",
@@ -18,4 +18,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/class-add.json b/doc/sphinx/api/class-add.json
index e4868e27ce..7e7ec01a29 100644
--- a/doc/sphinx/api/class-add.json
+++ b/doc/sphinx/api/class-add.json
@@ -1,12 +1,10 @@
 {
     "avail": "1.5.0",
     "brief": [
-        "This command is used to create and add a new class to the existing",
-        "server configuration."
+        "This command creates and adds a new class to the existing server configuration."
     ],
     "cmd-comment": [
-        "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only",
-        "one client class can be added with a single command. "
+        "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only one client class can be added with a single command. "
     ],
     "cmd-syntax": [
         "{",
@@ -28,8 +26,7 @@
     "hook": "class_cmds",
     "name": "class-add",
     "resp-comment": [
-        "The command will be successful (result 0), unless the",
-        "class name is a duplicate or another error occurs (result 1)."
+        "The command is successful (result 0), unless the class name is a duplicate or another error occurs (result 1)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json
index 86852122c1..8c073f1b9d 100644
--- a/doc/sphinx/api/class-del.json
+++ b/doc/sphinx/api/class-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.5.0",
     "brief": [
-        "This command is used to remove a client class from the server configuration."
+        "This command removes a client class from the server configuration."
     ],
     "cmd-syntax": [
         "{",
@@ -15,10 +15,14 @@
     "hook": "class_cmds",
     "name": "class-del",
     "resp-comment": [
+<<<<<<< HEAD
         "The command will return a result of 3 (empty) if the client",
         "class doesn't exist. If the client class exists, the returned",
         "result is 0 if the deletion was successful and the result is 1",
         "if the deletion is unsuccessful."
+=======
+        "The command returns a result of 3 (empty) if the client class does not exist. If the client class exists, the returned result is 0 if the deletion was successful; the result is 1 if the deletion is unsuccessful."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/class-get.json b/doc/sphinx/api/class-get.json
index 00c9738d93..648bd00134 100644
--- a/doc/sphinx/api/class-get.json
+++ b/doc/sphinx/api/class-get.json
@@ -1,8 +1,7 @@
 {
     "avail": "1.5.0",
     "brief": [
-        "This command is used to return detailed information about an",
-        "existing client class."
+        "This command returns detailed information about an existing client class."
     ],
     "cmd-syntax": [
         "{",
@@ -16,13 +15,7 @@
     "hook": "class_cmds",
     "name": "class-get",
     "resp-comment": [
-        "The returned information depends on the DHCP server type,",
-        "i.e. some parameters are specific to DHCPv4 server. Also,",
-        "some parameters may not be returned if they are not set for",
-        "the client class. If the class with specified name doesn't",
-        "exist a result of 3 (empty) is returned. If the client class",
-        "is found, the result of 0 is returned. If there is an error",
-        "while processing the command, the result of 1 is returned."
+        "The returned information depends on the DHCP server type, i.e. some parameters are specific to the DHCPv4 server. Also, some parameters may not be returned if they are not set for the client class. If a class with the specified name does not exist, a result of 3 (empty) is returned. If the client class is found, the result of 0 is returned. If there is an error while processing the command, the result of 1 is returned."
     ],
     "resp-syntax": [
         "{",
@@ -35,7 +28,7 @@
         "                \"only-if-required\": <only if required boolean value>,",
         "                \"test\": <test expression to be evaluated on incoming packets>,",
         "                \"option-data\": [ <option values here> ],",
-        "                \"option-def\": [ <option defintions here> ],",
+        "                \"option-def\": [ <option definitions here> ],",
         "                \"next-server\": <ipv4 address>,",
         "                \"server-hostname\": <string>,",
         "                \"boot-file-name\": <name of the boot file>",
diff --git a/doc/sphinx/api/class-list.json b/doc/sphinx/api/class-list.json
index 4f80828c67..b0e3f6bfa1 100644
--- a/doc/sphinx/api/class-list.json
+++ b/doc/sphinx/api/class-list.json
@@ -1,8 +1,7 @@
 {
     "avail": "1.5.0",
     "brief": [
-        "This command is used to retrieve a list of all client",
-        "classes from the server configuration."
+        "This command retrieves a list of all client classes from the server configuration."
     ],
     "cmd-comment": [
         "This command includes no arguments."
@@ -18,7 +17,7 @@
     "resp-comment": [
         "The returned list of classes merely contains their names.",
         "In order to retrieve full information about one of these",
-        "classes use :ref:`command-class-get`.",
+        "classes, use :ref:`command-class-get`.",
         "The returned result is 3 (empty) if no classes are found.",
         "If the command is processed successfully and the list of",
         "client classes is not empty, the result of 0 is returned.",
diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json
index f8fce814f4..e5731e05b6 100644
--- a/doc/sphinx/api/class-update.json
+++ b/doc/sphinx/api/class-update.json
@@ -1,12 +1,10 @@
 {
     "avail": "1.5.0",
     "brief": [
-        "This command is used to update an existing client class in",
-        "the server configuration."
+        "This command updates an existing client class in the server configuration."
     ],
     "cmd-comment": [
-        "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only",
-        "one client class can be updated with a single command. "
+        "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only one client class can be updated with a single command. "
     ],
     "cmd-syntax": [
         "{",
@@ -28,10 +26,14 @@
     "hook": "class_cmds",
     "name": "class-update",
     "resp-comment": [
+<<<<<<< HEAD
         "The command will return the result of 3 (empty) if the client",
         "class doesn't exist. If the client class exists, the returned",
         "result is 0 if the update was successful and the result is 1",
         "if the update is unsuccessful."
+=======
+        "The command returns the result of 3 (empty) if the client class does not exist. If the client class exists, the returned result is 0 if the update was successful or 1 if the update is unsuccessful."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/config-get.json b/doc/sphinx/api/config-get.json
index 6c4f8231fe..6fca9a2b3d 100644
--- a/doc/sphinx/api/config-get.json
+++ b/doc/sphinx/api/config-get.json
@@ -1,9 +1,7 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "Retrieves the current configuration used by the server. The configuration",
-        "is roughtly equal to the configuration file, but includes additional",
-        "changes made by other commands and due to parameters inheritance."
+        "This command retrieves the current configuration used by the server. The configuration is essentially the same as the contents of the configuration file, but includes additional changes made by other commands and due to parameters' inheritance."
     ],
     "cmd-comment": [
         "This command takes no parameters."
diff --git a/doc/sphinx/api/config-reload.json b/doc/sphinx/api/config-reload.json
index ac9e5e759a..bfd67c4f9f 100644
--- a/doc/sphinx/api/config-reload.json
+++ b/doc/sphinx/api/config-reload.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "The config-reload command instructs Kea to load again the configuration file that was used previously."
+        "This command instructs Kea to reload the configuration file that was used previously."
     ],
     "cmd-syntax": [
         "{",
@@ -16,4 +16,4 @@
         "kea-dhcp-ddns",
         "kea-ctrl-agent"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/config-set.json b/doc/sphinx/api/config-set.json
index 3270c20955..6e81cb6d62 100644
--- a/doc/sphinx/api/config-set.json
+++ b/doc/sphinx/api/config-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "The config-set command instructs the server to replace its current configuration with the new configuration supplied in the command's arguments."
+        "This command instructs the server to replace its current configuration with the new configuration supplied in the command's arguments."
     ],
     "cmd-comment": [
-        "where '<server>' is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\""
+        "In the example below, '<server>' is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/config-test.json b/doc/sphinx/api/config-test.json
index c77f1697e8..100e3bf906 100644
--- a/doc/sphinx/api/config-test.json
+++ b/doc/sphinx/api/config-test.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "The config-test command instructs the server to check whether the new configuration supplied in the command's arguments can be loaded."
+        "This command instructs the server to check whether the new configuration supplied in the command's arguments can be loaded."
     ],
     "cmd-comment": [
-        "where <server> is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"."
+        "In the example below, <server> is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/config-write.json b/doc/sphinx/api/config-write.json
index 490dc7d28d..0c4b916880 100644
--- a/doc/sphinx/api/config-write.json
+++ b/doc/sphinx/api/config-write.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "The config-write command instructs the Kea server to write its",
+        "This command instructs the Kea server to write its",
         "current configuration to a file on disk."
     ],
     "cmd-syntax": [
diff --git a/doc/sphinx/api/dhcp-disable.json b/doc/sphinx/api/dhcp-disable.json
index acb56c8c71..8e7bbfe987 100644
--- a/doc/sphinx/api/dhcp-disable.json
+++ b/doc/sphinx/api/dhcp-disable.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The dhcp-disable command globally disables the DHCP service."
+        "This command globally disables the DHCP service."
     ],
     "cmd-syntax": [
         "{",
@@ -17,4 +17,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/dhcp-enable.json b/doc/sphinx/api/dhcp-enable.json
index d4e64beb71..c51c222b9b 100644
--- a/doc/sphinx/api/dhcp-enable.json
+++ b/doc/sphinx/api/dhcp-enable.json
@@ -1,11 +1,11 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The dhcp-enable command globally enables the DHCP service."
+        "This command globally enables the DHCP service."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"dhcp-enable\"",
+        "    \"command\": \"dhcp-enable\",",
         "}"
     ],
     "description": "See <xref linkend=\"command-dhcp-enable\"/>",
@@ -14,4 +14,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/ha-continue.json b/doc/sphinx/api/ha-continue.json
index cac25680b8..b20caf148b 100644
--- a/doc/sphinx/api/ha-continue.json
+++ b/doc/sphinx/api/ha-continue.json
@@ -1,13 +1,13 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command is used to resume the operation of the paused HA state machine."
+        "This command resumes the operation of a paused HA state machine."
     ],
-    "description": "See <xref linkend=\"anchor-in-the-docs\"/>",
+    "description": "See <xref linkend=\"command-ha-continue\"/>",
     "hook": "high_availability",
     "name": "ha-continue",
     "support": [
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/ha-heartbeat.json b/doc/sphinx/api/ha-heartbeat.json
index 991c388f0b..15d5514c5e 100644
--- a/doc/sphinx/api/ha-heartbeat.json
+++ b/doc/sphinx/api/ha-heartbeat.json
@@ -1,8 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command is sent internally by a Kea partner when operating",
-        "in High-Availability (HA) mode. It retrieves the server's HA state and clock value."
+        "This command is sent internally by a Kea partner when operating in High-Availability (HA) mode. It retrieves the server's HA state and clock value."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/ha-scopes.json b/doc/sphinx/api/ha-scopes.json
index c8aca2dd41..54f8300bb9 100644
--- a/doc/sphinx/api/ha-scopes.json
+++ b/doc/sphinx/api/ha-scopes.json
@@ -4,7 +4,7 @@
         "This command modifies the scope that the server is responsible for serving when operating in High Availability (HA) mode."
     ],
     "cmd-comment": [
-        "In the example given, the arguments configure the server to handle traffic from both HA_server1 and HA_server2 scopes."
+        "In the example below, the arguments configure the server to handle traffic from both the HA_server1 and HA_server2 scopes."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/ha-sync.json b/doc/sphinx/api/ha-sync.json
index 2c1fa9dad7..4aad91737b 100644
--- a/doc/sphinx/api/ha-sync.json
+++ b/doc/sphinx/api/ha-sync.json
@@ -1,8 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The command is issued to instruct the server running in HA mode to ",
-        "synchronize its local lease database with the selected peer."
+        "This command instructs the server running in HA mode to synchronize its local lease database with the selected peer."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/lease4-add.json b/doc/sphinx/api/lease4-add.json
index e9b701f81f..daf666db92 100644
--- a/doc/sphinx/api/lease4-add.json
+++ b/doc/sphinx/api/lease4-add.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The lease4-add command adds a new IPv4 lease administratively."
+        "This command administratively adds a new IPv4 lease."
     ],
     "cmd-comment": [
-        "Note that Kea 1.4 requires an additional argument, subnet-ID, which is optional as of Kea 1.5. A number of other more detailed optional arguments are also supported."
+        "Note that Kea 1.4 requires an additional argument, subnet-ID, which is optional as of Kea 1.5. A number of other, more-detailed, optional arguments are also supported."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/lease4-del.json b/doc/sphinx/api/lease4-del.json
index 5a829a2d08..c7c3b13399 100644
--- a/doc/sphinx/api/lease4-del.json
+++ b/doc/sphinx/api/lease4-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease4-del can be used to delete a lease from the lease database."
+        "This command deletes a lease from the lease database."
     ],
     "cmd-comment": [
-        "Specify the lease to be deleted either by IP address, or by identifier-type and identifier value. Currently supported identifiers are \"hw-address\" and \"client-id\"."
+        "The lease to be deleted can be specified either by IP address or by identifier-type and identifier value. The currently supported identifiers are \"hw-address\" and \"client-id\"."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease4-get-all.json b/doc/sphinx/api/lease4-get-all.json
index f8eb99f999..d8605370a7 100644
--- a/doc/sphinx/api/lease4-get-all.json
+++ b/doc/sphinx/api/lease4-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "lease4-get-all is used to retrieve all IPv4 leases or all leases for the specified set of subnets."
+        "This command retrieves all IPv4 leases or all leases for the specified set of subnets."
     ],
     "cmd-comment": [
-        "The lease4-get-all command may result in very large responses."
+        "The ``lease4-get-all`` command may result in very large responses."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/lease4-get.json b/doc/sphinx/api/lease4-get.json
index ca5f139283..b46194e807 100644
--- a/doc/sphinx/api/lease4-get.json
+++ b/doc/sphinx/api/lease4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease4-get can be used to query the lease database and retrieve existing leases."
+        "This command queries the lease database and retrieves existing leases."
     ],
     "cmd-syntax": [
         "{",
@@ -15,7 +15,7 @@
     "hook": "lease_cmds",
     "name": "lease4-get",
     "resp-comment": [
-        "lease4-get returns a result that indicates a result of the operation and lease details, if found. It has one of the following values: 0 (success), 1 (error) or 2 (empty)."
+        "lease4-get returns a result that indicates the outcome of the operation and lease details, if found. It has one of the following values: 0 (success), 1 (error), or 2 (empty)."
     ],
     "resp-syntax": [
         "{",
@@ -38,4 +38,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease4-update.json b/doc/sphinx/api/lease4-update.json
index ea2422a5b3..d974a532c7 100644
--- a/doc/sphinx/api/lease4-update.json
+++ b/doc/sphinx/api/lease4-update.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The lease4-update command can be used to update existing leases."
+        "This command updates existing leases."
     ],
     "cmd-syntax": [
         "{",
@@ -21,4 +21,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease4-wipe.json b/doc/sphinx/api/lease4-wipe.json
index 1685a6d1c9..edb08ee1e8 100644
--- a/doc/sphinx/api/lease4-wipe.json
+++ b/doc/sphinx/api/lease4-wipe.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease4-wipe is designed to remove all leases associated with a given subnet."
+        "This command removes all leases associated with a given subnet."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/lease6-add.json b/doc/sphinx/api/lease6-add.json
index 344e7841f5..e950e63d2b 100644
--- a/doc/sphinx/api/lease6-add.json
+++ b/doc/sphinx/api/lease6-add.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The lease6-add command creates a new lease administratively."
+        "This command administratively creates a new lease."
     ],
     "cmd-comment": [
-        "lease6-add can be also used to add leases for IPv6 prefixes.."
+        "lease6-add can be also used to add leases for IPv6 prefixes."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/lease6-bulk-apply.json b/doc/sphinx/api/lease6-bulk-apply.json
index 0710fcae30..a39926bcbb 100644
--- a/doc/sphinx/api/lease6-bulk-apply.json
+++ b/doc/sphinx/api/lease6-bulk-apply.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The lease6-bulk-apply command can be used to create, update, and delete multiple IPv6 leases in a single transaction. This is used to communicate lease changes between the HA peers, but may be used in all cases where it is desirable to apply multiple lease updates in a single transaction."
+        "This command creates, updates, or deletes multiple IPv6 leases in a single transaction. It communicates lease changes between HA peers, but may be used in all cases where it is desirable to apply multiple lease updates in a single transaction."
     ],
     "cmd-comment": [
-        "If any of the leases is malformed, all changes are rolled back. If the leases are well-formed but the operation fails for one or more leases, these leases are listed in the response; however, the changes are preserved for all leases for which the operation was successful. The \"deleted-leases\" and \"leases\" are optional parameters but one of them must be specified."
+        "If any of the leases is malformed, all changes are rolled back. If the leases are well-formed but the operation fails for one or more leases, these leases are listed in the response; however, the changes are preserved for all leases for which the operation was successful. The \"deleted-leases\" and \"leases\" are optional parameters, but one of them must be specified."
     ],
     "cmd-syntax": [
         "{",
@@ -42,7 +42,7 @@
     "hook": "lease_cmds",
     "name": "lease6-bulk-apply",
     "resp-comment": [
-        "The \"failed-deleted-leases\" holds the list of leases which failed to delete. This includes leases which were not found in the database. The \"failed-leases\" includes the list of leases which failed to create or update. For each lease for which there was an error during processing, inserting it into the database, etc., the result is set to 1. For each lease which was not deleted because the server did not find it in the database, the result of 3 is returned."
+        "The \"failed-deleted-leases\" holds the list of leases which failed to delete; this includes leases which were not found in the database. The \"failed-leases\" includes the list of leases which failed to create or update. For each lease for which there was an error during processing, insertion into the database, etc., the result is set to 1. For each lease which was not deleted because the server did not find it in the database, the result of 3 is returned."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/lease6-del.json b/doc/sphinx/api/lease6-del.json
index f82993029d..e4f7c17491 100644
--- a/doc/sphinx/api/lease6-del.json
+++ b/doc/sphinx/api/lease6-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease6-del can be used to delete a lease from the lease database."
+        "This command deletes a lease from the lease database."
     ],
     "cmd-comment": [
-        "lease6-del returns a result that indicates a outcome of the operation. It has one of the following values: 0 (success), 1 (error) or 3 (empty)."
+        "lease6-del returns a result that indicates the outcome of the operation. It has one of the following values: 0 (success), 1 (error), or 3 (empty)."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease6-get-all.json b/doc/sphinx/api/lease6-get-all.json
index 01a4243dfa..165cd05a29 100644
--- a/doc/sphinx/api/lease6-get-all.json
+++ b/doc/sphinx/api/lease6-get-all.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease6-get-all is used to retrieve all IPv6 leases or all leases for the specified set of subnets."
+        "This command retrieves all IPv6 leases or all leases for the specified set of subnets."
     ],
     "cmd-syntax": [
         "{",
@@ -60,4 +60,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease6-get.json b/doc/sphinx/api/lease6-get.json
index 6ae039193c..84e36a44de 100644
--- a/doc/sphinx/api/lease6-get.json
+++ b/doc/sphinx/api/lease6-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease6-get can be used to query the lease database and retrieve existing leases."
+        "This command queries the lease database and retrieves existing leases."
     ],
     "cmd-comment": [
-        "lease6-get returns a result that indicates a result of the operation and lease details, if found. It has one of the following values: 0 (success), 1 (error) or 2 (empty)."
+        "lease6-get returns a result that indicates the outcome of the operation and lease details, if found. It has one of the following values: 0 (success), 1 (error), or 2 (empty)."
     ],
     "cmd-syntax": [
         "{",
@@ -21,4 +21,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease6-update.json b/doc/sphinx/api/lease6-update.json
index 767a59f95f..1167102634 100644
--- a/doc/sphinx/api/lease6-update.json
+++ b/doc/sphinx/api/lease6-update.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The lease6-update command can be used to update existing leases."
+        "This command updates existing leases."
     ],
     "cmd-syntax": [
         "{",
@@ -23,4 +23,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease6-wipe.json b/doc/sphinx/api/lease6-wipe.json
index 74c2d7d16b..8503841e68 100644
--- a/doc/sphinx/api/lease6-wipe.json
+++ b/doc/sphinx/api/lease6-wipe.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "lease6-wipe is designed to remove all leases associated with a given subnet."
+        "This command removes all leases associated with a given subnet."
     ],
     "cmd-comment": [
         "Note: not all backends support this command."
@@ -20,4 +20,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/leases-reclaim.json b/doc/sphinx/api/leases-reclaim.json
index 095522a3f7..894c79e768 100644
--- a/doc/sphinx/api/leases-reclaim.json
+++ b/doc/sphinx/api/leases-reclaim.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The leases-reclaim command instructs the server to reclaim all expired leases immediately."
+        "This command instructs the server to reclaim all expired leases immediately."
     ],
     "cmd-syntax": [
         "{",
@@ -17,4 +17,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/libreload.json b/doc/sphinx/api/libreload.json
index b3a4c8ede2..9c13c6c118 100644
--- a/doc/sphinx/api/libreload.json
+++ b/doc/sphinx/api/libreload.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "The libreload command will first unload and then load all currently loaded hook libraries."
+        "This command first unloads and then reloads all currently loaded hooks libraries."
     ],
     "cmd-comment": [
-        "The server will respond with a result of 0 indicating success, or 1 indicating a failure."
+        "The server responds with 0, indicating success, or 1, indicating a failure."
     ],
     "cmd-syntax": [
         "{",
@@ -18,4 +18,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/list-commands.json b/doc/sphinx/api/list-commands.json
index 61023c3929..d238a441cb 100644
--- a/doc/sphinx/api/list-commands.json
+++ b/doc/sphinx/api/list-commands.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The list-commands command retrieves a list of all commands supported by the server."
+        "This command retrieves a list of all commands supported by the server."
     ],
     "cmd-comment": [
-        "The server will respond with a list of all supported commands."
+        "The server responds with a list of all supported commands."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
         "kea-dhcp-ddns",
         "kea-ctrl-agent"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network4-add.json b/doc/sphinx/api/network4-add.json
index 9450f3492a..af180432a1 100644
--- a/doc/sphinx/api/network4-add.json
+++ b/doc/sphinx/api/network4-add.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network4-add command is used to add a new shared network."
+        "This command adds a new shared network."
     ],
     "cmd-syntax": [
         "{",
@@ -51,4 +51,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network4-del.json b/doc/sphinx/api/network4-del.json
index 8ae53ef1d2..2c11f4ebaf 100644
--- a/doc/sphinx/api/network4-del.json
+++ b/doc/sphinx/api/network4-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network4-del command is used to delete existing shared networks."
+        "This command deletes existing shared networks."
     ],
     "cmd-syntax": [
         "{",
@@ -30,4 +30,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network4-get.json b/doc/sphinx/api/network4-get.json
index a386286e13..bb8f792dfc 100644
--- a/doc/sphinx/api/network4-get.json
+++ b/doc/sphinx/api/network4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network4-get command is used to retrieve detailed information about shared networks, including subnets currently being part of a given network."
+        "This command retrieves detailed information about shared networks, including subnets that are currently part of a given network."
     ],
     "cmd-syntax": [
         "{",
@@ -37,12 +37,12 @@
         "                {",
         "                    \"subnet\": \"192.0.2.0/24\",",
         "                    \"id\": 5,",
-        "                    // many other subnet specific details here",
+        "                    // many other subnet-specific details here",
         "                },",
         "                {",
         "                    \"subnet\": \"192.0.3.0/31\",",
         "                    \"id\": 6,",
-        "                    // many other subnet specific details here",
+        "                    // many other subnet-specific details here",
         "                }",
         "            ],",
         "            \"valid-lifetime\": 120",
diff --git a/doc/sphinx/api/network4-list.json b/doc/sphinx/api/network4-list.json
index 142d65e728..535f64697b 100644
--- a/doc/sphinx/api/network4-list.json
+++ b/doc/sphinx/api/network4-list.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network4-list command is used to retrieve full list of currently configured shared networks."
+        "This command retrieves the full list of currently configured shared networks."
     ],
     "cmd-syntax": [
         "{",
@@ -26,4 +26,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network4-subnet-add.json b/doc/sphinx/api/network4-subnet-add.json
index 802d521150..9b8c28f95c 100644
--- a/doc/sphinx/api/network4-subnet-add.json
+++ b/doc/sphinx/api/network4-subnet-add.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network4-subnet-add command is used to add existing subnets to existing shared networks."
+        "This command adds existing subnets to existing shared networks."
     ],
     "cmd-syntax": [
         "{",
@@ -24,4 +24,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network4-subnet-del.json b/doc/sphinx/api/network4-subnet-del.json
index d8b76dd058..edfa5c51f4 100644
--- a/doc/sphinx/api/network4-subnet-del.json
+++ b/doc/sphinx/api/network4-subnet-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network4-subnet-del command is used to remove a subnet that is part of an existing shared network and demote it to a plain, stand-alone subnet."
+        "This command removes a subnet that is part of an existing shared network and demotes it to a plain, stand-alone subnet."
     ],
     "cmd-syntax": [
         "{",
@@ -24,4 +24,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network6-add.json b/doc/sphinx/api/network6-add.json
index 0280df5acb..8f6139a7d1 100644
--- a/doc/sphinx/api/network6-add.json
+++ b/doc/sphinx/api/network6-add.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network6-add command is used to add a new shared network."
+        "This command adds a new shared network."
     ],
     "cmd-comment": [
-        "The network6-add uses the same syntax for both the query and the response. However, there are some parameters that are IPv4-only (e.g. match-client-id) and some are IPv6-only (e.g. interface-id)."
+        "The ``network6-add`` command uses the same syntax as ``network4-add`` for both the query and the response. However, there are some parameters that are IPv4-only (e.g. match-client-id) and some that are IPv6-only (e.g. interface-id)."
     ],
     "cmd-syntax": [
         "{",
@@ -54,4 +54,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network6-del.json b/doc/sphinx/api/network6-del.json
index 022fc1f02e..739e0fcfd0 100644
--- a/doc/sphinx/api/network6-del.json
+++ b/doc/sphinx/api/network6-del.json
@@ -1,11 +1,11 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network6-del command is used to delete existing shared networks."
+        "This command deletes existing shared networks."
     ],
     "cmd-comment": [
-        "The network6-del command uses exactly the same syntax for",
-        "both the command and the response."
+        "The ``network6-del`` command uses exactly the same syntax as ``network4-del`` for",
+        "both the query and the response."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/network6-get.json b/doc/sphinx/api/network6-get.json
index 893bb17cb9..199aa9d620 100644
--- a/doc/sphinx/api/network6-get.json
+++ b/doc/sphinx/api/network6-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network6-get command is used to retrieve detailed information about shared networks, including subnets currently being part of a given network."
+        "The network6-get command retrieves detailed information about shared networks, including subnets that are currently part of a given network."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/network6-list.json b/doc/sphinx/api/network6-list.json
index 6ccca085eb..65a0890d33 100644
--- a/doc/sphinx/api/network6-list.json
+++ b/doc/sphinx/api/network6-list.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network6-list command is used to retrieve full list of currently configured shared networks."
+        "This command retrieves the full list of currently configured shared networks."
     ],
     "cmd-comment": [
-        "network6-list follows exactly the same syntax for both the query and the response."
+        "The ``network6-list`` command uses exactly the same syntax as ``network4-list`` for both the query and the response."
     ],
     "cmd-syntax": [
         "{",
@@ -29,4 +29,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network6-subnet-add.json b/doc/sphinx/api/network6-subnet-add.json
index 110bf455ea..c828d35051 100644
--- a/doc/sphinx/api/network6-subnet-add.json
+++ b/doc/sphinx/api/network6-subnet-add.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network6-subnet-add command is used to add existing subnets to existing shared networks."
+        "This command adds existing subnets to existing shared networks."
     ],
     "cmd-comment": [
-        "The network6-subnet-add command uses exactly the same syntax for both the command and the response."
+        "The ``network6-subnet-add`` command uses exactly the same syntax as ``network4-subnet-add`` for both the query and the response."
     ],
     "cmd-syntax": [
         "{",
@@ -27,4 +27,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network6-subnet-del.json b/doc/sphinx/api/network6-subnet-del.json
index 31eb948fb9..1e157d1c9b 100644
--- a/doc/sphinx/api/network6-subnet-del.json
+++ b/doc/sphinx/api/network6-subnet-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "The network6-subnet-del command is used to remove a subnet that is part of existing shared network and demote it to a plain, stand-alone subnet."
+        "This command removes a subnet that is part of an existing shared network and demotes it to a plain, stand-alone subnet."
     ],
     "cmd-comment": [
-        "The network6-subnet-del command uses exactly the same syntax for both the command and the response."
+        "The ``network6-subnet-del`` command uses exactly the same syntax as ``network4-subnet-del`` for both the query and the response."
     ],
     "cmd-syntax": [
         "{",
@@ -27,4 +27,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/remote-global-parameter4-del.json b/doc/sphinx/api/remote-global-parameter4-del.json
index 1fc907dfcb..531d039453 100644
--- a/doc/sphinx/api/remote-global-parameter4-del.json
+++ b/doc/sphinx/api/remote-global-parameter4-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete a global DHCPv4 parameter from the configuration database. The server will use the value specified in the configuration file or a default value (if the parameter is not specified in the configuration file) after deleting the parameter from the database."
+        "This command deletes a global DHCPv4 parameter from the configuration database. The server uses the value specified in the configuration file, or a default value if the parameter is not specified, after deleting the parameter from the database."
     ],
     "cmd-comment": [
-        "This command carries the list including exactly one name of the parameter to be deleted. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+        "This command carries the list including exactly one name of the parameter to be deleted. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter4-get-all.json b/doc/sphinx/api/remote-global-parameter4-get-all.json
index aa42d2eeab..246fae114b 100644
--- a/doc/sphinx/api/remote-global-parameter4-get-all.json
+++ b/doc/sphinx/api/remote-global-parameter4-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch all global parameters for the server from the specified database."
+        "This command fetches all global parameters for the server from the specified database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the global parameters shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed; it fetches the global parameters shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-global-parameter4-get-all",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains a global parameter name/value pair. The value may be a JSON string, integer, real or boolean. The metadata is appended to each parameter and it provides database specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the global parameters shared between all servers. It excludes server specific global parameters. If an explicit server tag is included in the command, the response contains all global parameters directly associated with the given server and the global parameters associated with all servers when server specific values are not present."
+        "The returned response contains a list of maps. Each map contains a global parameter name/value pair. The value may be a JSON string, integer, real, or boolean. The metadata is appended to each parameter and provides database-specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the global parameters shared among all servers. It excludes server-specific global parameters. If an explicit server tag is included in the command, the response contains all global parameters directly associated with the given server, and the global parameters associated with all servers when server-specific values are not present."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter4-get.json b/doc/sphinx/api/remote-global-parameter4-get.json
index cacdd2780e..0e29608a06 100644
--- a/doc/sphinx/api/remote-global-parameter4-get.json
+++ b/doc/sphinx/api/remote-global-parameter4-get.json
@@ -1,10 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
+<<<<<<< HEAD
         "This command is used to fetch the selected global parameter for the server from the specified database."
+=======
+        "This command fetches the selected global parameter for the server from the specified database."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-comment": [
-        "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global parameter value shared by all servers."
+        "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it fetches the global parameter value shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -21,7 +25,7 @@
     "hook": "cb_cmds",
     "name": "remote-global-parameter4-get",
     "resp-comment": [
-        "The returned response contains a map with a global parameter name/value pair. The value may be a JSON string, integer, real or boolean. The metadata is included and it provides database specific information associated with the returned object. If the \"all\" server tag was specified, the command attempts to fetch the global parameter value associated with all servers. If the explicit server tag is specified, the command will fetch the value associated with the given server. If the server specific value doesn't exist, it will try to fetch the value associated with all servers."
+        "The returned response contains a map with a global parameter name/value pair. The value may be a JSON string, integer, real, or boolean. The metadata is included and provides database-specific information associated with the returned object. If the \"all\" server tag is specified, the command attempts to fetch the global parameter value associated with all servers. If the explicit server tag is specified, the command fetches the value associated with the given server. If the server-specific value does not exist, the ``remote-global-parameter4-get`` command fetches the value associated with all servers."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter4-set.json b/doc/sphinx/api/remote-global-parameter4-set.json
index b20691165b..de9af8a12e 100644
--- a/doc/sphinx/api/remote-global-parameter4-set.json
+++ b/doc/sphinx/api/remote-global-parameter4-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or update one or more global parameters in the configuration database."
+        "This command creates or updates one or more global parameters in the configuration database."
     ],
     "cmd-comment": [
-        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter; in some cases, only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter4-get-all`` command may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified parameters with all servers."
+        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter; in some cases, only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter4-get-all`` command may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it associates the specified parameters with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter6-del.json b/doc/sphinx/api/remote-global-parameter6-del.json
index 80bd95c2d6..4c5a39ccb2 100644
--- a/doc/sphinx/api/remote-global-parameter6-del.json
+++ b/doc/sphinx/api/remote-global-parameter6-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete a global DHCPv6 parameter from the configuration database. The server will use the value specified in the configuration file or a default value (if the parameter is not specified in the configuration file) after deleting the parameter from the database."
+        "This command deletes a global DHCPv6 parameter from the configuration database. The server uses the value specified in the configuration file, or a default value if the parameter is not specified in the configuration file, after deleting the parameter from the database."
     ],
     "cmd-comment": [
-        "This command carries the list including exactly one name of the parameter to be deleted. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+        "This command carries the list including exactly one name of the parameter to be deleted. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter6-get-all.json b/doc/sphinx/api/remote-global-parameter6-get-all.json
index d2f8e144eb..ae08dc1163 100644
--- a/doc/sphinx/api/remote-global-parameter6-get-all.json
+++ b/doc/sphinx/api/remote-global-parameter6-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch all global parameters for the server from the specified database."
+        "This command fetches all global parameters for the server from the specified database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the global parameters shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed; it fetches the global parameters shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-global-parameter6-get-all",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains a global parameter name/value pair. The value may be a JSON string, integer, real or boolean. The metadata is appended to each parameter and it provides database specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the global parameters shared between all servers. It excludes server specific global parameters. If an explicit server tag is included in the command, the response contains all global parameters directly associated with the given server and the global parameters associated with all servers when server specific values are not present."
+        "The returned response contains a list of maps. Each map contains a global parameter name/value pair. The value may be a JSON string, integer, real, or boolean. The metadata is appended to each parameter and provides database-specific information associated with the returned objects. If the server tag \"all\" is included in the command, the response contains the global parameters shared among all servers. It excludes server-specific global parameters. If an explicit server tag is included in the command, the response contains all global parameters directly associated with the given server, and the global parameters associated with all servers when server-specific values are not present."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter6-get.json b/doc/sphinx/api/remote-global-parameter6-get.json
index 7a38fe1857..477dee861c 100644
--- a/doc/sphinx/api/remote-global-parameter6-get.json
+++ b/doc/sphinx/api/remote-global-parameter6-get.json
@@ -1,10 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
+<<<<<<< HEAD
         "This command is used to fetch the selected global parameter for the server from the specified database."
+=======
+        "This command fetches the selected global parameter for the server from the specified database."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-comment": [
-        "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global parameter value shared by all servers."
+        "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it fetches the global parameter value shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -21,7 +25,7 @@
     "hook": "cb_cmds",
     "name": "remote-global-parameter6-get",
     "resp-comment": [
-        "The returned response contains a map with a global parameter name/value pair. The value may be a JSON string, integer, real or boolean. The metadata is included and it provides database specific information associated with the returned object. If the \"all\" server tag was specified, the command attempts to fetch the global parameter value associated with all servers. If the explicit server tag is specified, the command will fetch the value associated with the given server. If the server specific value doesn't exist, it will try to fetch the value associated with all servers."
+        "The returned response contains a map with a global parameter name/value pair. The value may be a JSON string, integer, real, or boolean. The metadata is included and provides database-specific information associated with the returned object. If the \"all\" server tag is specified, the command attempts to fetch the global parameter value associated with all servers. If the explicit server tag is specified, the command fetches the value associated with the given server. If the server-specific value does not exist, the ``remote-global-parameter6-get`` fetches the value associated with all servers."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter6-set.json b/doc/sphinx/api/remote-global-parameter6-set.json
index 5363544ce8..b2d73f5f62 100644
--- a/doc/sphinx/api/remote-global-parameter6-set.json
+++ b/doc/sphinx/api/remote-global-parameter6-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or update one or more global parameters in the configuration database."
+        "This command creates or updates one or more global parameters in the configuration database."
     ],
     "cmd-comment": [
-        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter; in some cases, only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter6-get-all`` command may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified parameters with all servers."
+        "This command carries multiple global parameters with their values. Care should be taken when specifying more than one parameter; in some cases, only a subset of the parameters may be successfully stored in the database and other parameters may fail to be stored. In such cases the ``remote-global-parameter6-get-all`` command may be useful to verify the contents of the database after the update. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it associates the specified parameters with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network4-del.json b/doc/sphinx/api/remote-network4-del.json
index 6aee9e2dca..7a54e02ffe 100644
--- a/doc/sphinx/api/remote-network4-del.json
+++ b/doc/sphinx/api/remote-network4-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete an IPv4 shared network from the configuration database."
+        "This command deletes an IPv4 shared network from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one name of the shared network to be deleted. The ``subnets-action`` denotes whether the subnets in this shared network should be deleted or not. The ``server-tags`` parameter must not be specified for this command."
+        "This command includes a list with exactly one name of the shared network to be deleted. The ``subnets-action`` parameter denotes whether the subnets in this shared network should be deleted. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network4-get.json b/doc/sphinx/api/remote-network4-get.json
index 6ae0e5bdd2..5a15da7f0c 100644
--- a/doc/sphinx/api/remote-network4-get.json
+++ b/doc/sphinx/api/remote-network4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the selected IPv4 shared network for the server from the specified database."
+        "This command fetches the selected IPv4 shared network for the server from the specified database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one name of the shared network to be returned. The ``subnets-include`` optional parameter allows for specifying whether the subnets belonging to the shared network should also be returned. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-network4-list.json b/doc/sphinx/api/remote-network4-list.json
index bafbdb0654..e315b96ebd 100644
--- a/doc/sphinx/api/remote-network4-list.json
+++ b/doc/sphinx/api/remote-network4-list.json
@@ -1,10 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a list of all IPv4 shared networks from the configuration database."
+        "This command fetches a list of all IPv4 shared networks from the configuration database."
     ],
     "cmd-comment": [
+<<<<<<< HEAD
         "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
+=======
+        "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
@@ -20,7 +24,7 @@
     "hook": "cb_cmds",
     "name": "remote-network4-list",
     "resp-comment": [
-        "The returned response contains the list of maps. Each map contains the shared network name and the metadata which provides database-specific information associated with the shared network. The returned list does not contain full definitions of the shared networks. Use ``remote-network4-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
+        "The returned response contains the list of maps. Each map contains the shared network name and the metadata, which provides database-specific information associated with the shared network. The returned list does not contain full definitions of the shared networks; use ``remote-network4-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network4-set.json b/doc/sphinx/api/remote-network4-set.json
index 232b46eb2e..1a4293f8ac 100644
--- a/doc/sphinx/api/remote-network4-set.json
+++ b/doc/sphinx/api/remote-network4-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace an IPv4 shared network in the configuration database."
+        "This command creates or replaces an IPv4 shared network in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one shared network specification. It must not contain subnets (\"subnet4\" parameter). The subnets are added to the shared network using ``remote-subnet4-set`` command. The ``server-tags`` list is mandatory and it must contain one or more server tags as strings to explicitly associate the shared network with one or more user defined servers. It may include the special server tag \"all\" to associate the network with all servers."
+        "The provided list must contain exactly one shared network specification, and must not contain subnets (the \"subnet4\" parameter). The subnets are added to the shared network using the ``remote-subnet4-set`` command. The ``server-tags`` list is mandatory and must contain one or more server tags as strings to explicitly associate the shared network with one or more user-defined servers. It may include the special server tag \"all\" to associate the network with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-del.json b/doc/sphinx/api/remote-network6-del.json
index 402911c59f..63602db9da 100644
--- a/doc/sphinx/api/remote-network6-del.json
+++ b/doc/sphinx/api/remote-network6-del.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete an IPv6 shared network from the configuration database."
+        "This command deletes an IPv6 shared network from the configuration database."
     ],
     "cmd-comment": [
-        "This command includes a list with exactly one name of the shared network to be deleted. The ``subnets-action`` denotes whether the subnets in this shared network should be deleted or not. The ``server-tags`` parameter must not be specified for this command."
+        "This command includes a list with exactly one name of the shared network to be deleted. The ``subnets-action`` parameter indicates whether the subnets in this shared network should be deleted. The ``server-tags`` parameter must not be specified for this command."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-get.json b/doc/sphinx/api/remote-network6-get.json
index eee9257cc5..0bd5221249 100644
--- a/doc/sphinx/api/remote-network6-get.json
+++ b/doc/sphinx/api/remote-network6-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the selected IPv6 shared network for the server from the specified database."
+        "This command fetches the selected IPv6 shared network for the server from the specified database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one name of the shared network to be returned. The ``subnets-include`` optional parameter allows for specifying whether the subnets belonging to the shared network should also be returned. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-network6-list.json b/doc/sphinx/api/remote-network6-list.json
index 00727d2533..578d826916 100644
--- a/doc/sphinx/api/remote-network6-list.json
+++ b/doc/sphinx/api/remote-network6-list.json
@@ -1,10 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a list of all IPv6 shared networks from the configuration database."
+        "This command fetches a list of all IPv6 shared networks from the configuration database."
     ],
     "cmd-comment": [
+<<<<<<< HEAD
         "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
+=======
+        "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
@@ -20,7 +24,7 @@
     "hook": "cb_cmds",
     "name": "remote-network6-list",
     "resp-comment": [
-        "The returned response contains the list of maps. Each map contains the shared network name and the metadata which provides database-specific information associated with the shared network. The returned list does not contain full definitions of the shared networks. Use ``remote-network6-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
+        "The returned response contains the list of maps. Each map contains the shared network name and the metadata, which provides database-specific information associated with the shared network. The returned list does not contain full definitions of the shared networks; use ``remote-network6-get`` to fetch the full information about the selected shared networks. If the command includes explicit server tags as strings (including the special server tag \"all\"), the list contains all shared networks which are associated with any of the specified tags. A network is returned even if it is associated with multiple servers and only one of the specified tags matches. If the command includes the ``null`` value in the ``server-tags`` list, the response contains all shared networks which are assigned to no servers (unassigned)."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-set.json b/doc/sphinx/api/remote-network6-set.json
index 9643683a11..d4bfad2b31 100644
--- a/doc/sphinx/api/remote-network6-set.json
+++ b/doc/sphinx/api/remote-network6-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace an IPv6 shared network in the configuration database."
+        "This command creates or replaces an IPv6 shared network in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one shared network specification. It must not contain subnets (\"subnet6\" parameter). The subnets are added to the shared network using ``remote-subnet6-set`` command. The ``server-tags`` list is mandatory and it must contain one or more server tags as strings to explicitly associate the shared network with one or more user defined servers. It may include the special server tag \"all\" to associate the network with all servers."
+        "The provided list must contain exactly one shared network specification, and must not contain subnets (the \"subnet6\" parameter). The subnets are added to the shared network using the ``remote-subnet6-set`` command. The ``server-tags`` list is mandatory and must contain one or more server tags as strings to explicitly associate the shared network with one or more user-defined servers. It may include the special server tag \"all\" to associate the network with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-del.json b/doc/sphinx/api/remote-option-def4-del.json
index 7daaf995cb..099ffdb211 100644
--- a/doc/sphinx/api/remote-option-def4-del.json
+++ b/doc/sphinx/api/remote-option-def4-del.json
@@ -1,10 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete a DHCPv4 option definition from the configuration database."
+        "This command deletes a DHCPv4 option definition from the configuration database."
     ],
     "cmd-comment": [
+<<<<<<< HEAD
         "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+=======
+        "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-get-all.json b/doc/sphinx/api/remote-option-def4-get-all.json
index 5a4d49241d..ea51b63ebb 100644
--- a/doc/sphinx/api/remote-option-def4-get-all.json
+++ b/doc/sphinx/api/remote-option-def4-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch all DHCPv4 option definitions from the configuration database."
+        "This command fetches all DHCPv4 option definitions from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the option definitions shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed, to fetch the option definitions shared by all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-get.json b/doc/sphinx/api/remote-option-def4-get.json
index f5f0ade55f..cc37416d47 100644
--- a/doc/sphinx/api/remote-option-def4-get.json
+++ b/doc/sphinx/api/remote-option-def4-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a DHCPv4 option definition from the configuration database."
+        "This command fetches a DHCPv4 option definition from the configuration database."
     ],
     "cmd-comment": [
-        "The desired option definition is identified by the pair of the option code/space values. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the option definition instance shared by all servers."
+        "The desired option definition is identified by the pair of option code/space values. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed, to fetch the option definition instance shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -26,7 +26,7 @@
     "hook": "cb_cmds",
     "name": "remote-option-def4-get",
     "resp-comment": [
-        "The metadata is included and it provides database specific information associated with the returned object. If the \"all\" server tag was specified, the command attempts to fetch the option definition associated with all servers. If the explicit server tag is specified, the command will fetch the option definition associated with the given server. If the server specific option definition doesn't exist, it will try to fetch the option definition associated with all servers."
+        "The metadata is included and provides database-specific information associated with the returned object. If the \"all\" server tag is specified, the command attempts to fetch the option definition associated with all servers. If the explicit server tag is specified, the command fetches the option definition associated with the given server. If the server-specific option definition does not exist, the ``remote-option-def4-get`` command fetches the option definition associated with all servers."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-set.json b/doc/sphinx/api/remote-option-def4-set.json
index d819efa0ad..fc78615ba0 100644
--- a/doc/sphinx/api/remote-option-def4-set.json
+++ b/doc/sphinx/api/remote-option-def4-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace DHCPv4 option definition in the configuration database."
+        "This command creates or replaces a DHCPv4 option definition in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one option definition specification. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified option definition with all servers."
+        "The provided list must contain exactly one option definition specification. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it associates the specified option definition with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-del.json b/doc/sphinx/api/remote-option-def6-del.json
index 516ca103b3..6ee611365c 100644
--- a/doc/sphinx/api/remote-option-def6-del.json
+++ b/doc/sphinx/api/remote-option-def6-del.json
@@ -1,10 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete a DHCPv6 option definition from the configuration database."
+        "This command deletes a DHCPv6 option definition from the configuration database."
     ],
     "cmd-comment": [
+<<<<<<< HEAD
         "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
+=======
+        "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
+>>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-get-all.json b/doc/sphinx/api/remote-option-def6-get-all.json
index 49b9984d88..c8cebfe02b 100644
--- a/doc/sphinx/api/remote-option-def6-get-all.json
+++ b/doc/sphinx/api/remote-option-def6-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch all DHCPv6 option definitions from the configuration database."
+        "This command fetches all DHCPv6 option definitions from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the option definitions shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed, to fetch the option definitions shared by all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-get.json b/doc/sphinx/api/remote-option-def6-get.json
index 557a45fc79..e0061ea370 100644
--- a/doc/sphinx/api/remote-option-def6-get.json
+++ b/doc/sphinx/api/remote-option-def6-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a DHCPv6 option definition from the configuration database."
+        "This command fetches a DHCPv6 option definition from the configuration database."
     ],
     "cmd-comment": [
-        "The desired option definition is identified by the pair of the option code/space values. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the option definition instance shared by all servers."
+        "The desired option definition is identified by the pair of option code/space values. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed, to fetch the option definition instance shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -26,7 +26,7 @@
     "hook": "cb_cmds",
     "name": "remote-option-def6-get",
     "resp-comment": [
-        "The metadata is included and it provides database specific information associated with the returned object. If the \"all\" server tag was specified, the command attempts to fetch the option definition associated with all servers. If the explicit server tag is specified, the command will fetch the option definition associated with the given server. If the server specific option definition doesn't exist, it will try to fetch the option definition associated with all servers."
+        "The metadata is included and provides database-specific information associated with the returned object. If the \"all\" server tag is specified, the command fetches the option definition associated with all servers. If the explicit server tag is specified, the command fetches the option definition associated with the given server. If the server-specific option definition does not exist, the ``remote-option-def6-get`` command fetches the option definition associated with all servers."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-set.json b/doc/sphinx/api/remote-option-def6-set.json
index 5017a4d07e..d9ff5c0949 100644
--- a/doc/sphinx/api/remote-option-def6-set.json
+++ b/doc/sphinx/api/remote-option-def6-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace DHCPv6 option definition in the configuration database."
+        "This command creates or replaces a DHCPv6 option definition in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one option definition specification. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified option definition with all servers."
+        "The provided list must contain exactly one option definition specification. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it associates the specified option definition with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option4-global-del.json b/doc/sphinx/api/remote-option4-global-del.json
index e88b659823..18933e6b31 100644
--- a/doc/sphinx/api/remote-option4-global-del.json
+++ b/doc/sphinx/api/remote-option4-global-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete a DHCPv4 global option from the configuration database."
+        "This command deletes a DHCPv4 global option from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one option specification, comprising an option name and code. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
diff --git a/doc/sphinx/api/remote-option4-global-get-all.json b/doc/sphinx/api/remote-option4-global-get-all.json
index 97a0eeabb5..7ac4fd5c59 100644
--- a/doc/sphinx/api/remote-option4-global-get-all.json
+++ b/doc/sphinx/api/remote-option4-global-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch all DHCPv4 global options for the server from the configuration database."
+        "This command fetches all DHCPv4 global options for the server from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the global options shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed, to fetch the global options shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-option4-global-get-all",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains a global option specification and the metadata including database specific information associated with the returned object. If the server tag \"all\" is included in the command, the response contains the global options shared between all servers. It excludes server specific global options. If an explicit server tag is included in the command, the response contains all global options directly associated with the given server and the options associated with all servers when server specific options are not present."
+        "The returned response contains a list of maps. Each map contains a global option specification and the metadata, including database-specific information associated with the returned object. If the server tag \"all\" is included in the command, the response contains the global options shared among all servers. It excludes server-specific global options. If an explicit server tag is included in the command, the response contains all global options directly associated with the given server, and the options associated with all servers when server-specific options are not present."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option4-global-get.json b/doc/sphinx/api/remote-option4-global-get.json
index 6be271d484..c5515dab65 100644
--- a/doc/sphinx/api/remote-option4-global-get.json
+++ b/doc/sphinx/api/remote-option4-global-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a global DHCPv4 option for the server from the specified database."
+        "This command fetches a global DHCPv4 option for the server from the specified database."
     ],
     "cmd-comment": [
-        "The option is identified by the pair of option code/space values. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global option instance shared by all servers."
+        "The option is identified by the pair of option code/space values. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed, to fetch the global option instance shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -26,12 +26,12 @@
     "hook": "cb_cmds",
     "name": "remote-option4-global-get",
     "resp-comment": [
-        "The metadata is included and it provides database specific information associated with the returned object. If the \"all\" server tag was specified, the command attempts to fetch the global option associated with all servers. If the explicit server tag is specified, the command will fetch the global option associated with the given server. If the server specific option doesn't exist, it will try to fetch the option associated with all servers."
+        "The metadata is included and provides database specific information associated with the returned object. If the \"all\" server tag is specified, the command fetches the global option associated with all servers. If the explicit server tag is specified, the command fetches the global option associated with the given server. If the server specific option does not exist, it fetches the option associated with all servers."
     ],
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"DHCPv4 option in found.\",",
+        "    \"text\": \"DHCPv4 option is found.\",",
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
diff --git a/doc/sphinx/api/remote-option4-global-set.json b/doc/sphinx/api/remote-option4-global-set.json
index 9164db93c6..fa1fd41bc9 100644
--- a/doc/sphinx/api/remote-option4-global-set.json
+++ b/doc/sphinx/api/remote-option4-global-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace a DHCPv4 global option in the configuration database."
+        "This command creates or replaces a DHCPv4 global option in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must cotain exactly one option specification. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified option with all servers."
+        "The provided list must contain exactly one option specification. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it associates the specified option with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option6-global-del.json b/doc/sphinx/api/remote-option6-global-del.json
index 472543ef72..9cf32bd96a 100644
--- a/doc/sphinx/api/remote-option6-global-del.json
+++ b/doc/sphinx/api/remote-option6-global-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete a DHCPv6 global option from the configuration database."
+        "This command deletes a DHCPv6 global option from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one option specification, comprising an option name and code. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
diff --git a/doc/sphinx/api/remote-option6-global-get-all.json b/doc/sphinx/api/remote-option6-global-get-all.json
index 6952f16942..a0bf8607fd 100644
--- a/doc/sphinx/api/remote-option6-global-get-all.json
+++ b/doc/sphinx/api/remote-option6-global-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch all DHCPv6 global options for the server from the configuration database."
+        "This command fetches all DHCPv6 global options for the server from the configuration database."
     ],
     "cmd-comment": [
-        "The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The special server tag \"all\" is allowed to fetch the global options shared by all servers."
+        "The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The special server tag \"all\" is allowed, to fetch the global options shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -20,7 +20,7 @@
     "hook": "cb_cmds",
     "name": "remote-option6-global-get-all",
     "resp-comment": [
-        "The returned response contains a list of maps. Each map contains a global option specification and the metadata including database specific information associated with the returned object. If the server tag \"all\" is included in the command, the response contains the global options shared between all servers. It excludes server specific global options. If an explicit server tag is included in the command, the response contains all global options directly associated with the given server and the options associated with all servers when server specific options are not present."
+        "The returned response contains a list of maps. Each map contains a global option specification and the metadata, including database-specific information associated with the returned object. If the server tag \"all\" is included in the command, the response contains the global options shared between all servers. It excludes server-specific global options. If an explicit server tag is included in the command, the response contains all global options directly associated with the given server, and the options associated with all servers when server-specific options are not present."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option6-global-get.json b/doc/sphinx/api/remote-option6-global-get.json
index a0a2b9335e..c790a43f7f 100644
--- a/doc/sphinx/api/remote-option6-global-get.json
+++ b/doc/sphinx/api/remote-option6-global-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a global DHCPv6 option for the server from the specified database."
+        "This command fetches a global DHCPv6 option for the server from the specified database."
     ],
     "cmd-comment": [
-        "The option is identified by the pair of option code/space values. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed to fetch the global option instance shared by all servers."
+        "The option is identified by the pair of option code/space values. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed, to fetch the global option instance shared by all servers."
     ],
     "cmd-syntax": [
         "{",
@@ -26,12 +26,12 @@
     "hook": "cb_cmds",
     "name": "remote-option6-global-get",
     "resp-comment": [
-        "The metadata is included and it provides database specific information associated with the returned object. If the \"all\" server tag was specified, the command attempts to fetch the global option associated with all servers. If the explicit server tag is specified, the command will fetch the global option associated with the given server. If the server specific option doesn't exist, it will try to fetch the option associated with all servers."
+        "The metadata is included and provides database-specific information associated with the returned object. If the \"all\" server tag is specified, the command attempts to fetch the global option associated with all servers. If the explicit server tag is specified, the command will fetch the global option associated with the given server. If the server-specific option does not exist, it fetches the option associated with all servers."
     ],
     "resp-syntax": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"DHCPv6 option in found.\",",
+        "    \"text\": \"DHCPv6 option is found.\",",
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
diff --git a/doc/sphinx/api/remote-option6-global-set.json b/doc/sphinx/api/remote-option6-global-set.json
index a32a5f55b1..6b9619af86 100644
--- a/doc/sphinx/api/remote-option6-global-set.json
+++ b/doc/sphinx/api/remote-option6-global-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace a DHCPv6 global option in the configuration database."
+        "This command creates or replaces a DHCPv6 global option in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must cotain exactly one option specification. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error. The server tag \"all\" is allowed and it associates the specified option with all servers."
+        "The provided list must contain exactly one option specification. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it associates the specified option with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-server4-del.json b/doc/sphinx/api/remote-server4-del.json
index 7be6ffe98b..cc476168a2 100644
--- a/doc/sphinx/api/remote-server4-del.json
+++ b/doc/sphinx/api/remote-server4-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete information about a DHCPv4 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. The shareable configuration elements (e.g. subnets, shared networks) are not deleted as they may be used by other servers."
+        "This command deletes information about a DHCPv4 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. Shareable configuration elements (e.g. subnets, shared networks) are not deleted as they may be used by other servers."
     ],
     "cmd-comment": [
         "This command carries the list including exactly one map with the tag of the server to be deleted."
diff --git a/doc/sphinx/api/remote-server4-get-all.json b/doc/sphinx/api/remote-server4-get-all.json
index f78b828fa1..b39e332265 100644
--- a/doc/sphinx/api/remote-server4-get-all.json
+++ b/doc/sphinx/api/remote-server4-get-all.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch information about all DHCPv4 servers specified by the user."
+        "This command fetches information about all DHCPv4 servers specified by the user."
     ],
     "cmd-comment": [
         "This command contains no arguments besides the optional ``remote``."
@@ -19,7 +19,7 @@
     "hook": "cb_cmds",
     "name": "remote-server4-get-all",
     "resp-comment": [
-        "The returned response contain a list of maps. Each map contains a server tag uniquely identifying a server and the user defined description of the server. The Kea Configuration Backend uses the keyword ``all`` to associate parts of the configuration with all servers. Internally, it creates the logical server ``all`` for this purpose. However, this logical server is not returned as a result of the ``remote-server4-get-all``. Only the user defined servers are returned."
+        "The returned response contain a list of maps. Each map contains a server tag uniquely identifying a server, and the user-defined description of the server. The Kea Configuration Backend uses the keyword ``all`` to associate parts of the configuration with all servers. Internally, it creates the logical server ``all`` for this purpose. However, this logical server is not returned as a result of the ``remote-server4-get-all`` command; only the user-defined servers are returned."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-server4-get.json b/doc/sphinx/api/remote-server4-get.json
index b83cdf5373..8080a4df37 100644
--- a/doc/sphinx/api/remote-server4-get.json
+++ b/doc/sphinx/api/remote-server4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the information about the DHCPv4 server, such as server tag and description."
+        "This command fetches information about the DHCPv4 server, such as the server tag and description."
     ],
     "cmd-comment": [
         "This command carries the list including exactly one map with the tag of the server to be fetched."
diff --git a/doc/sphinx/api/remote-server4-set.json b/doc/sphinx/api/remote-server4-set.json
index 75e3251848..e81b6a79ec 100644
--- a/doc/sphinx/api/remote-server4-set.json
+++ b/doc/sphinx/api/remote-server4-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace information about the DHCPv4 server in the database."
+        "This command creates or replaces information about the DHCPv4 server in the database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one server specification. The ``server-tag`` must be unique accross all servers within the configuration database. The ``description`` is the arbitrary text describing the server, its location within the network etc."
+        "The provided list must contain exactly one server specification. The ``server-tag`` must be unique across all servers within the configuration database. The ``description`` is the arbitrary text describing the server, its location within the network, etc."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-server6-del.json b/doc/sphinx/api/remote-server6-del.json
index 4e7651e813..8ea350ff88 100644
--- a/doc/sphinx/api/remote-server6-del.json
+++ b/doc/sphinx/api/remote-server6-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete information about a DHCPv6 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. The shareable configuration elements (e.g. subnets, shared networks) are not deleted as they may be used by other servers."
+        "This command deletes information about a DHCPv6 server from the configuration database. Any configuration explicitly associated with the deleted server is automatically disassociated. In addition, configuration elements not shareable with other servers (e.g. global DHCP parameters) are deleted. Shareable configuration elements (e.g. subnets, shared networks) are not deleted as they may be used by other servers."
     ],
     "cmd-comment": [
         "This command carries the list including exactly one map with the tag of the server to be deleted."
diff --git a/doc/sphinx/api/remote-server6-get-all.json b/doc/sphinx/api/remote-server6-get-all.json
index 9f5c8aad8e..d9b8c7e90b 100644
--- a/doc/sphinx/api/remote-server6-get-all.json
+++ b/doc/sphinx/api/remote-server6-get-all.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch information about all DHCPv6 servers specified by the user."
+        "This command fetches information about all DHCPv6 servers specified by the user."
     ],
     "cmd-comment": [
         "This command contains no arguments besides the optional ``remote``."
@@ -19,7 +19,7 @@
     "hook": "cb_cmds",
     "name": "remote-server6-get-all",
     "resp-comment": [
-        "The returned response contain a list of maps. Each map contains a server tag uniquely identifying a server and the user defined description of the server. The Kea Configuration Backend uses the keyword ``all`` to associate parts of the configuration with all servers. Internally, it creates the logical server ``all`` for this purpose. However, this logical server is not returned as a result of the ``remote-server6-get-all``. Only the user defined servers are returned."
+        "The returned response contain a list of maps. Each map contains a server tag uniquely identifying a server, and the user-defined description of the server. The Kea Configuration Backend uses the keyword ``all`` to associate parts of the configuration with all servers. Internally, it creates the logical server ``all`` for this purpose. However, this logical server is not returned as a result of the ``remote-server6-get-all`` command; only the user-defined servers are returned."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-server6-get.json b/doc/sphinx/api/remote-server6-get.json
index 76d58e6af9..99455d751b 100644
--- a/doc/sphinx/api/remote-server6-get.json
+++ b/doc/sphinx/api/remote-server6-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the information about the DHCPv6 server, such as server tag and description."
+        "This command fetches information about the DHCPv6 server, such as the server tag and description."
     ],
     "cmd-comment": [
         "This command carries the list including exactly one map with the tag of the server to be fetched."
diff --git a/doc/sphinx/api/remote-server6-set.json b/doc/sphinx/api/remote-server6-set.json
index 7e890848be..0241060657 100644
--- a/doc/sphinx/api/remote-server6-set.json
+++ b/doc/sphinx/api/remote-server6-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace information about the DHCPv6 server in the database."
+        "This command creates or replaces information about the DHCPv6 server in the database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one server specification. The ``server-tag`` must be unique accross all servers within the configuration database. The ``description`` is the arbitrary text describing the server, its location within the network etc."
+        "The provided list must contain exactly one server specification. The ``server-tag`` must be unique across all servers within the configuration database. The ``description`` is the arbitrary text describing the server, its location within the network, etc."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet4-del-by-id.json b/doc/sphinx/api/remote-subnet4-del-by-id.json
index 7c3b6c3c80..7037c76cc7 100644
--- a/doc/sphinx/api/remote-subnet4-del-by-id.json
+++ b/doc/sphinx/api/remote-subnet4-del-by-id.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete an IPv4 subnet by ID from the configuration database."
+        "This command deletes an IPv4 subnet by ID from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one ID of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-subnet4-del-by-prefix.json b/doc/sphinx/api/remote-subnet4-del-by-prefix.json
index 4099f5ad12..bd16dee37b 100644
--- a/doc/sphinx/api/remote-subnet4-del-by-prefix.json
+++ b/doc/sphinx/api/remote-subnet4-del-by-prefix.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete an IPv4 subnet by prefix from the configuration database."
+        "This command deletes an IPv4 subnet by prefix from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one prefix of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-subnet4-get-by-id.json b/doc/sphinx/api/remote-subnet4-get-by-id.json
index f14c00e9c2..706092e263 100644
--- a/doc/sphinx/api/remote-subnet4-get-by-id.json
+++ b/doc/sphinx/api/remote-subnet4-get-by-id.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the selected IPv4 subnet by ID for the server from the configuration database."
+        "This command fetches the selected IPv4 subnet by ID from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one ID of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
@@ -22,7 +22,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet4-get-by-id",
     "resp-comment": [
-        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
+        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (a global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet4-get-by-prefix.json b/doc/sphinx/api/remote-subnet4-get-by-prefix.json
index c3d447c039..23e468585d 100644
--- a/doc/sphinx/api/remote-subnet4-get-by-prefix.json
+++ b/doc/sphinx/api/remote-subnet4-get-by-prefix.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the selected IPv4 subnet by prefix from the configuration database."
+        "This command fetches the selected IPv4 subnet by prefix from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one prefix of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-subnet4-list.json b/doc/sphinx/api/remote-subnet4-list.json
index fb14d51647..3226be93e1 100644
--- a/doc/sphinx/api/remote-subnet4-list.json
+++ b/doc/sphinx/api/remote-subnet4-list.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a list of all IPv4 subnets from the configuration database."
+        "This command fetches a list of all IPv4 subnets from the configuration database."
     ],
     "cmd-comment": [
         "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
diff --git a/doc/sphinx/api/remote-subnet4-set.json b/doc/sphinx/api/remote-subnet4-set.json
index dae774c37f..a2592501d8 100644
--- a/doc/sphinx/api/remote-subnet4-set.json
+++ b/doc/sphinx/api/remote-subnet4-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace an IPv4 subnet the configuration database."
+        "This command creates or replaces an IPv4 subnet in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one subnet specification. The ``shared-network-name`` parameter is required for these commands. It associates the subnet with the shared network by its name. If the subnet must not belong to any shared network (global subnet), the ``null`` value must be specified for the shared network name. The ``server-tags`` list is mandatory and it must contain one or more server tags as strings to explicitly associate the subnet with one or more user defined servers. It may include the special server tag \"all\" to associate the subnet with all servers."
+        "The provided list must contain exactly one subnet specification. The ``shared-network-name`` parameter is required for these commands; it associates the subnet with the shared network by its name. If the subnet must not belong to any shared network (a global subnet), the ``null`` value must be specified for the shared network name. The ``server-tags`` list is mandatory and must contain one or more server tags as strings to explicitly associate the subnet with one or more user-defined servers. The ``remote-subnet4-set`` command may include the special server tag \"all\" to associate the subnet with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet6-del-by-id.json b/doc/sphinx/api/remote-subnet6-del-by-id.json
index 83c704cd65..d6ac7fab38 100644
--- a/doc/sphinx/api/remote-subnet6-del-by-id.json
+++ b/doc/sphinx/api/remote-subnet6-del-by-id.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete an IPv6 subnet by ID from the configuration database."
+        "This command deletes an IPv6 subnet by ID from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one ID of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-subnet6-del-by-prefix.json b/doc/sphinx/api/remote-subnet6-del-by-prefix.json
index c9f71ec57e..4752ac0207 100644
--- a/doc/sphinx/api/remote-subnet6-del-by-prefix.json
+++ b/doc/sphinx/api/remote-subnet6-del-by-prefix.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to delete an IPv6 subnet by prefix from the configuration database."
+        "This command deletes an IPv6 subnet by prefix from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one prefix of the subnet to be deleted. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-subnet6-get-by-id.json b/doc/sphinx/api/remote-subnet6-get-by-id.json
index 3d23c7a38c..6e06225263 100644
--- a/doc/sphinx/api/remote-subnet6-get-by-id.json
+++ b/doc/sphinx/api/remote-subnet6-get-by-id.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the selected IPv6 subnet by ID for the server from the configuration database."
+        "This command fetches the selected IPv6 subnet by ID from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one ID of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
@@ -24,7 +24,7 @@
     "hook": "cb_cmds",
     "name": "remote-subnet6-get-by-id",
     "resp-comment": [
-        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
+        "If the shared network name is null, it means that the returned subnet does not belong to any shared network (a global subnet). The metadata is included in the returned subnet definition and provides database-specific information associated with the returned object."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-subnet6-get-by-prefix.json b/doc/sphinx/api/remote-subnet6-get-by-prefix.json
index 6bb16d51cf..f4bea4a9ef 100644
--- a/doc/sphinx/api/remote-subnet6-get-by-prefix.json
+++ b/doc/sphinx/api/remote-subnet6-get-by-prefix.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch the selected IPv6 subnet by prefix from the configuration database."
+        "This command fetches the selected IPv6 subnet by prefix from the configuration database."
     ],
     "cmd-comment": [
         "This command includes a list with exactly one prefix of the subnet to be returned. The ``server-tags`` parameter must not be specified for this command."
diff --git a/doc/sphinx/api/remote-subnet6-list.json b/doc/sphinx/api/remote-subnet6-list.json
index b6a82db8d6..f27b487e51 100644
--- a/doc/sphinx/api/remote-subnet6-list.json
+++ b/doc/sphinx/api/remote-subnet6-list.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch a list of all IPv6 subnets from the configuration database."
+        "This command fetches a list of all IPv6 subnets from the configuration database."
     ],
     "cmd-comment": [
         "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
diff --git a/doc/sphinx/api/remote-subnet6-set.json b/doc/sphinx/api/remote-subnet6-set.json
index ae5ec431c8..3d657c97c4 100644
--- a/doc/sphinx/api/remote-subnet6-set.json
+++ b/doc/sphinx/api/remote-subnet6-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to create or replace an IPv6 subnet the configuration database."
+        "This command creates or replaces an IPv6 subnet in the configuration database."
     ],
     "cmd-comment": [
-        "The provided list must contain exactly one subnet specification. The ``shared-network-name`` parameter is required for these commands. It associates the subnet with the shared network by its name. If the subnet must not belong to any shared network (global subnet), the ``null`` value must be specified for the shared network name. The ``server-tags`` list is mandatory and it must contain one or more server tags as strings to explicitly associate the subnet with one or more user defined servers. It may include the special server tag \"all\" to associate the subnet with all servers."
+        "The provided list must contain exactly one subnet specification. The ``shared-network-name`` parameter is required for these commands; it associates the subnet with the shared network by its name. If the subnet must not belong to any shared network (a global subnet), the ``null`` value must be specified for the shared network name. The ``server-tags`` list is mandatory and must contain one or more server tags as strings to explicitly associate the subnet with one or more user-defined servers. The ``remote-subnet6-set`` command may include the special server tag \"all\" to associate the subnet with all servers."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/reservation-add.json b/doc/sphinx/api/reservation-add.json
index bd7ab5ef4c..db6f73de67 100644
--- a/doc/sphinx/api/reservation-add.json
+++ b/doc/sphinx/api/reservation-add.json
@@ -1,15 +1,10 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "Adds a new host reservation. The reservation may include IPv4 address,",
-        "IPv6 addresses, IPv6 prefixes, various identifiers, a class",
-        "the client will be assigned to, DHCPv4 and DHCPv6 options and",
-        "more."
+        "This command adds a new host reservation. The reservation may include IPv4 addresses, IPv6 addresses, IPv6 prefixes, various identifiers, a class the client will be assigned to, DHCPv4 and DHCPv6 options, and more."
     ],
     "cmd-comment": [
-        "Note the ip-address, client-id, next-server, server-hostname and",
-        "boot-file-name are IPv4 specific. duid, ip-addresses and prefixes are",
-        "IPv6 specific."
+        "Note that ip-address, client-id, next-server, server-hostname, and boot-file-name are IPv4-specific. duid, ip-addresses, and prefixes are IPv6-specific."
     ],
     "cmd-syntax": [
         "{",
@@ -23,13 +18,13 @@
         "            \"duid\": <string>,",
         "            \"flex-id\": <string>,",
         "            \"ip-address\": <string (IPv4 address)>,",
-        "            \"ip-addresses\": [ <comma separated strings> ],",
+        "            \"ip-addresses\": [ <comma-separated strings> ],",
         "            \"hw-address\": <string>,",
         "            \"hostname\": <string>,",
         "            \"next-server\": <string (IPv4 address)>,",
-        "            \"option-data-list\": [ <comma separated structures defining options> ],",
-        "            \"prefixes\": [ <comma separated IPv6 prefixes> ],",
-        "            \"reservation-client-classes\": [ <comma separated strings> ],",
+        "            \"option-data-list\": [ <comma-separated structures defining options> ],",
+        "            \"prefixes\": [ <comma-separated IPv6 prefixes> ],",
+        "            \"reservation-client-classes\": [ <comma-separated strings> ],",
         "            \"server-hostname\": <string>,",
         "            \"subnet-id\": <integer>,",
         "            \"user-context\": <any valid JSON>",
diff --git a/doc/sphinx/api/reservation-del.json b/doc/sphinx/api/reservation-del.json
index 4c4ab6f1a2..087d5d780b 100644
--- a/doc/sphinx/api/reservation-del.json
+++ b/doc/sphinx/api/reservation-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "Deletes an existing host reservation."
+        "This command deletes an existing host reservation."
     ],
     "cmd-comment": [
         "The host reservation can be identified by either the (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
diff --git a/doc/sphinx/api/reservation-get-all.json b/doc/sphinx/api/reservation-get-all.json
index af55a40773..6f5094b41f 100644
--- a/doc/sphinx/api/reservation-get-all.json
+++ b/doc/sphinx/api/reservation-get-all.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Retrieve all host reservations for a specified subnet."
+        "This command retrieves all host reservations for a specified subnet."
     ],
     "cmd-syntax": [
         "{",
@@ -14,7 +14,7 @@
     "hook": "host_cmds",
     "name": "reservation-get-all",
     "resp-comment": [
-        "reservation-get-all command may result in very large responses."
+        "The reservation-get-all command may result in very large responses."
     ],
     "support": [
         "kea-dhcp4",
diff --git a/doc/sphinx/api/reservation-get-page.json b/doc/sphinx/api/reservation-get-page.json
index d92756c53d..507d609731 100644
--- a/doc/sphinx/api/reservation-get-page.json
+++ b/doc/sphinx/api/reservation-get-page.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Retrieve host reservations for a specified subnet by page."
+        "This command retrieves host reservations for a specified subnet by page."
     ],
     "cmd-comment": [
-        "the subnet id and the page size limit are mandatory. The source index and from host id are optional and default to 0. Values to use to next the next page are returned in responses in a next map."
+        "The subnet-id and the page size limit are mandatory. The source-index and from host id are optional and default to 0. Values to use to load the next page are returned in responses in a next map."
     ],
     "cmd-syntax": [
         "{",
@@ -23,4 +23,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/reservation-get.json b/doc/sphinx/api/reservation-get.json
index 78c681d34e..fa4ce9ed56 100644
--- a/doc/sphinx/api/reservation-get.json
+++ b/doc/sphinx/api/reservation-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "This command is used to retrieve an existing host reservation."
+        "This command retrieves an existing host reservation."
     ],
     "cmd-comment": [
         "The host reservation can be identified by either the (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
@@ -19,8 +19,7 @@
     "hook": "host_cmds",
     "name": "reservation-get",
     "resp-comment": [
-        "The arguments object appears only if a host is found. Many fields in the arguments",
-        "object appear only if a specific field is set."
+        "The arguments object appears only if a host is found. Many fields in the arguments object appear only if a specific field is set."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/server-tag-get.json b/doc/sphinx/api/server-tag-get.json
index 26925c0456..54d74a1e80 100644
--- a/doc/sphinx/api/server-tag-get.json
+++ b/doc/sphinx/api/server-tag-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The server-tag-get command returns the server tag."
+        "This command returns the server tag."
     ],
     "cmd-syntax": [
         "{",
@@ -14,4 +14,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/shutdown.json b/doc/sphinx/api/shutdown.json
index 5ebab23016..f3c05835bb 100644
--- a/doc/sphinx/api/shutdown.json
+++ b/doc/sphinx/api/shutdown.json
@@ -1,11 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The shutdown command instructs the server to initiate its shutdown procedure."
+        "This command instructs the server to initiate its shutdown procedure."
     ],
     "cmd-comment": [
-        "The server will respond with a confirmation that the shutdown",
-        "procedure has been initiated."
+        "The server responds with a confirmation that the shutdown procedure has been initiated."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/statistic-get-all.json b/doc/sphinx/api/statistic-get-all.json
index 83690cf70e..5d10490b1b 100644
--- a/doc/sphinx/api/statistic-get-all.json
+++ b/doc/sphinx/api/statistic-get-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The statistic-get-all command retrieves all statistics recorded."
+        "This command retrieves all recorded statistics."
     ],
     "cmd-comment": [
-        "The server will respond with details of all recorded statistics, with result set to 0 indicating that it iterated over all statistics (even when the total number of statistics is zero)."
+        "The server responds with the details of all recorded statistics, with a result of 0 indicating that it iterated over all statistics (even when the total number of statistics is zero)."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/statistic-get.json b/doc/sphinx/api/statistic-get.json
index 3b923d6bb9..eb2d09f19b 100644
--- a/doc/sphinx/api/statistic-get.json
+++ b/doc/sphinx/api/statistic-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The statistic-get command retrieves a single statistic. It takes a single string parameter called name that specifies the statistic name."
+        "This command retrieves a single statistic. It takes a single string parameter called name that specifies the statistic name."
     ],
     "cmd-comment": [
-        "The server will respond with details of the requested statistic, with a result set to 0 indicating success and the specified statistic as the value of the \"arguments\" parameter."
+        "The server responds with the details of the requested statistic, with a result of 0 indicating success, and the specified statistic as the value of the \"arguments\" parameter."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/statistic-remove-all.json b/doc/sphinx/api/statistic-remove-all.json
index eb007a1cf4..7f28fb7d06 100644
--- a/doc/sphinx/api/statistic-remove-all.json
+++ b/doc/sphinx/api/statistic-remove-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The statistic-remove-all command attempts to delete all statistics."
+        "This command deletes all statistics."
     ],
     "cmd-comment": [
-        "If the removal of all statistics was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered, the server will return a status code of 1 (error) and the text field will contain the error description."
+        "If the removal of all statistics is successful, the server responds with a status of 0, indicating success, and an empty parameters field. If an error is encountered, the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -18,4 +18,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-remove.json b/doc/sphinx/api/statistic-remove.json
index 41a150afaa..766956fdf1 100644
--- a/doc/sphinx/api/statistic-remove.json
+++ b/doc/sphinx/api/statistic-remove.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The statistic-remove command attempts to delete a single statistic. It takes a single string parameter called name that specifies the statistic name."
+        "This command deletes a single statistic. It takes a single string parameter called name that specifies the statistic name."
     ],
     "cmd-comment": [
-        "If the specific statistic is found and its removal was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered (e.g. requested statistic was not found), the server will return a status code of 1 (error) and the text field will contain the error description."
+        "If the specific statistic is found and its removal is successful, the server responds with a status of 0, indicating success, and an empty parameters field. If an error is encountered (e.g. the requested statistic was not found), the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-reset-all.json b/doc/sphinx/api/statistic-reset-all.json
index 789bc279b6..4879b0a3b3 100644
--- a/doc/sphinx/api/statistic-reset-all.json
+++ b/doc/sphinx/api/statistic-reset-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The statistic-reset command sets all statistics to their neutral values: 0 for integer, 0.0 for float, 0h0m0s0us for time duration and \"\" for string type."
+        "This command sets all statistics to their neutral values: 0 for integer, 0.0 for float, 0h0m0s0us for time duration, and \"\" for string type."
     ],
     "cmd-comment": [
-        "If the operation is successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered, the server will return a status code of 1 (error) and the text field will contain the error description."
+        "If the operation is successful, the server responds with a status of 0, indicating success, and an empty parameters field. If an error is encountered, the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -18,4 +18,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-reset.json b/doc/sphinx/api/statistic-reset.json
index 5c094a5a00..ee901c929f 100644
--- a/doc/sphinx/api/statistic-reset.json
+++ b/doc/sphinx/api/statistic-reset.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.0.0",
     "brief": [
-        "The statistic-reset command sets the specified statistic to its neutral value: 0 for integer, 0.0 for float, 0h0m0s0us for time duration and \"\" for string type. It takes a single string parameter called name that specifies the statistic name."
+        "This command sets the specified statistic to its neutral value: 0 for integer, 0.0 for float, 0h0m0s0us for time duration, and \"\" for string type. It takes a single string parameter called name that specifies the statistic name."
     ],
     "cmd-comment": [
-        "If the specific statistic is found and reset was successful, the server will respond with a status of 0, indicating success and an empty parameters field. If an error is encountered (e.g. requested statistic was not found), the server will return a status code of 1 (error) and the text field will contain the error description."
+        "If the specific statistic is found and the reset is successful, the server responds with a status of 0, indicating success, and an empty parameters field. If an error is encountered (e.g. the requested statistic was not found), the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-sample-age-set-all.json b/doc/sphinx/api/statistic-sample-age-set-all.json
index 343de3db1e..f94a4c027d 100644
--- a/doc/sphinx/api/statistic-sample-age-set-all.json
+++ b/doc/sphinx/api/statistic-sample-age-set-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The statistic-sample-age-set-all command sets time based limit for all statistics. It takes a single integer parameter called duration."
+        "This command sets a time-based limit for all statistics. It takes a single integer parameter called duration."
     ],
     "cmd-comment": [
-        "The server will respond with message about successfully set limits for all statistics, with a result set to 0 indicating success and an empty parameters field. If an error is encountered, the server will return a status code of 1 (error) and the text field will contain the error description."
+        "The server responds with a message about successfully set limits for all statistics, with a result of 0 indicating success, and an empty parameters field. If an error is encountered, the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-sample-age-set.json b/doc/sphinx/api/statistic-sample-age-set.json
index d94e8960c9..0b0932c182 100644
--- a/doc/sphinx/api/statistic-sample-age-set.json
+++ b/doc/sphinx/api/statistic-sample-age-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The statistic-sample-age-set command sets time based limit for single statistic. It takes two parameters: a string called name and an integer value called duration."
+        "This command sets a time-based limit for a single statistic. It takes two parameters: a string called name and an integer value called duration."
     ],
     "cmd-comment": [
-        "The server will respond with message about successfully set limit for the given statistic, with a result set to 0 indicating success and an empty parameters field. If an error is encountered (e.g. requested statistic was not found), the server will return a status code of 1 (error) and the text field will contain the error description."
+        "The server responds with a message about a successfully set limit for the given statistic, with a result of 0 indicating success, and an empty parameters field. If an error is encountered (e.g. the requested statistic was not found), the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -21,4 +21,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-sample-count-set-all.json b/doc/sphinx/api/statistic-sample-count-set-all.json
index 41fc8c2839..c5d8510bda 100644
--- a/doc/sphinx/api/statistic-sample-count-set-all.json
+++ b/doc/sphinx/api/statistic-sample-count-set-all.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The statistic-sample-count-set-all command sets size based limit for all statistics. It takes a single integer parameter called max-samples."
+        "This command sets a size-based limit for all statistics. It takes a single integer parameter called max-samples."
     ],
     "cmd-comment": [
-        "The server will respond with message about successfully set limits for all statistics, with a result set to 0 indicating success and an empty parameters field. If an error is encountered, the server will return a status code of 1 (error) and the text field will contain the error description."
+        "The server responds with a message about successfully set limits for all statistics, with a result of 0 indicating success, and an empty parameters field. If an error is encountered, the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -20,4 +20,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/statistic-sample-count-set.json b/doc/sphinx/api/statistic-sample-count-set.json
index a8f8cccf72..74bc9b3c45 100644
--- a/doc/sphinx/api/statistic-sample-count-set.json
+++ b/doc/sphinx/api/statistic-sample-count-set.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "The statistic-sample-count-set command sets size based limit for single statistic. It takes two parameters: a string called name and an integer value called max-samples."
+        "This command sets a size-based limit for a single statistic. It takes two parameters: a string called name and an integer value called max-samples."
     ],
     "cmd-comment": [
-        "The server will respond with message about successfully set limit for the given statistic, with a result set to 0 indicating success and an empty parameters field. If an error is encountered (e.g. requested statistic was not found), the server will return a status code of 1 (error) and the text field will contain the error description."
+        "The server responds with a message about a successfully set limit for the given statistic, with a result of 0 indicating success, and an empty parameters field. If an error is encountered (e.g. the requested statistic was not found), the server returns a status code of 1 (error) and the text field contains the error description."
     ],
     "cmd-syntax": [
         "{",
@@ -21,4 +21,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet4-add.json b/doc/sphinx/api/subnet4-add.json
index 09b7d545cb..57f61ca3d6 100644
--- a/doc/sphinx/api/subnet4-add.json
+++ b/doc/sphinx/api/subnet4-add.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to create and add a new subnet to the existing server configuration."
+        "This command creates and adds a new subnet to the existing server configuration. This operation has no impact on other subnets."
     ],
     "cmd-syntax": [
         "{",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet4-del.json b/doc/sphinx/api/subnet4-del.json
index 16646da802..b019402f3d 100644
--- a/doc/sphinx/api/subnet4-del.json
+++ b/doc/sphinx/api/subnet4-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to remove a subnet from the server's configuration. This command has no effect on other configured subnets but removing a subnet has certain implications which the server's administrator should be aware of."
+        "This command removes a subnet from the server's configuration. This command has no effect on other configured subnets, but removing a subnet has certain implications which the server's administrator should be aware of."
     ],
     "cmd-syntax": [
         "{",
@@ -31,4 +31,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet4-get.json b/doc/sphinx/api/subnet4-get.json
index c1b910b7b4..80fcff1a7b 100644
--- a/doc/sphinx/api/subnet4-get.json
+++ b/doc/sphinx/api/subnet4-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to retrieve detailed information about the specified subnet. This command usually follows ``subnet4-list``, which is used to discover available subnets with their respective subnet identifiers and prefixes."
+        "This command retrieves detailed information about the specified subnet. This command usually follows ``subnet4-list``, which discovers available subnets with their respective subnet identifiers and prefixes."
     ],
     "cmd-syntax": [
         "{",
@@ -25,7 +25,7 @@
         "                \"id\": 1,",
         "                \"option-data\": [",
         "                    ...",
-        "                ]",
+        "                ],",
         "                ...",
         "            }",
         "        ]",
diff --git a/doc/sphinx/api/subnet4-list.json b/doc/sphinx/api/subnet4-list.json
index bd15914d9e..4b9a6847b3 100644
--- a/doc/sphinx/api/subnet4-list.json
+++ b/doc/sphinx/api/subnet4-list.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to list all currently configured subnets. The subnets are returned in a brief form, i.e. a subnet identifier and subnet prefix is included for each subnet."
+        "This command lists all currently configured subnets. The subnets are returned in a brief format, i.e. a subnet identifier and subnet prefix are included for each subnet."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/subnet4-update.json b/doc/sphinx/api/subnet4-update.json
index cc08248b64..d1424c4897 100644
--- a/doc/sphinx/api/subnet4-update.json
+++ b/doc/sphinx/api/subnet4-update.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to update a subnet in the existing server configuration."
+        "This command updates a subnet in the existing server configuration. This operation has no impact on other subnets."
     ],
     "cmd-syntax": [
         "{",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet6-add.json b/doc/sphinx/api/subnet6-add.json
index 38bdbc658f..96e8b505df 100644
--- a/doc/sphinx/api/subnet6-add.json
+++ b/doc/sphinx/api/subnet6-add.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to create and add new subnet to the existing server configuration. This operation has no impact on other subnets."
+        "This command creates and adds a new subnet to the existing server configuration. This operation has no impact on other subnets."
     ],
     "cmd-syntax": [
         "{",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet6-del.json b/doc/sphinx/api/subnet6-del.json
index ec429f74eb..1b928a9e0f 100644
--- a/doc/sphinx/api/subnet6-del.json
+++ b/doc/sphinx/api/subnet6-del.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to remove a subnet from the server's configuration. This command has no effect on other configured subnets but removing a subnet has certain implications which the server's administrator should be aware of."
+        "This command removes a subnet from the server's configuration. This command has no effect on other configured subnets, but removing a subnet has certain implications which the server's administrator should be aware of."
     ],
     "cmd-syntax": [
         "{",
@@ -29,4 +29,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet6-get.json b/doc/sphinx/api/subnet6-get.json
index 8134135e69..2692c38265 100644
--- a/doc/sphinx/api/subnet6-get.json
+++ b/doc/sphinx/api/subnet6-get.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to retrieve detailed information about the specified subnet. This command usually follows ``subnet6-list``, which is used to discover available subnets with their respective subnet identifiers and prefixes."
+        "This command retrieves detailed information about the specified subnet. This command usually follows ``subnet6-list``, which discovers available subnets with their respective subnet identifiers and prefixes."
     ],
     "cmd-syntax": [
         "{",
@@ -25,7 +25,7 @@
         "                \"id\": 1,",
         "                \"option-data\": [",
         "                    ...",
-        "                ]",
+        "                ],",
         "                ...",
         "            }",
         "        ]",
diff --git a/doc/sphinx/api/subnet6-list.json b/doc/sphinx/api/subnet6-list.json
index 2e5482a9d3..08270afab2 100644
--- a/doc/sphinx/api/subnet6-list.json
+++ b/doc/sphinx/api/subnet6-list.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.3.0",
     "brief": [
-        "This command is used to list all currently configured subnets. The subnets are returned in a brief form, i.e. a subnet identifier and subnet prefix is included for each subnet."
+        "This command lists all currently configured subnets. The subnets are returned in a brief format, i.e. a subnet identifier and subnet prefix are included for each subnet."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/subnet6-update.json b/doc/sphinx/api/subnet6-update.json
index a2e9dc2c82..94b34aab21 100644
--- a/doc/sphinx/api/subnet6-update.json
+++ b/doc/sphinx/api/subnet6-update.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to update a subnet in the existing server configuration. This operation has no impact on other subnets."
+        "This command updates a subnet in the existing server configuration. This operation has no impact on other subnets."
     ],
     "cmd-syntax": [
         "{",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/version-get.json b/doc/sphinx/api/version-get.json
index 22027e5099..c44320cea9 100644
--- a/doc/sphinx/api/version-get.json
+++ b/doc/sphinx/api/version-get.json
@@ -1,9 +1,7 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "The version-get command returns extended information about",
-        "Kea version. The returned string is the same as if Kea would",
-        "be run with ``-V`` command line option."
+        "This command returns extended information about the Kea version that is running. The returned string is the same as if Kea were run with the ``-V`` command-line option."
     ],
     "cmd-syntax": [
         "{",
-- 
GitLab


From 2891e28344cc5f0e23cecc9193ef4e78754ace42 Mon Sep 17 00:00:00 2001
From: Suzanne Goldlust <sgoldlust@isc.org>
Date: Fri, 9 Aug 2019 18:02:02 -0400
Subject: [PATCH 08/13] A few more text/formatting edits

---
 doc/sphinx/api/class-del.json                    | 7 -------
 doc/sphinx/api/class-update.json                 | 9 +--------
 doc/sphinx/api/remote-global-parameter4-get.json | 4 ----
 doc/sphinx/api/remote-global-parameter6-get.json | 4 ----
 doc/sphinx/api/remote-network4-list.json         | 4 ----
 doc/sphinx/api/remote-network6-list.json         | 4 ----
 doc/sphinx/api/remote-option-def4-del.json       | 4 ----
 doc/sphinx/api/remote-option-def6-del.json       | 4 ----
 8 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json
index 8c073f1b9d..4635563311 100644
--- a/doc/sphinx/api/class-del.json
+++ b/doc/sphinx/api/class-del.json
@@ -15,14 +15,7 @@
     "hook": "class_cmds",
     "name": "class-del",
     "resp-comment": [
-<<<<<<< HEAD
-        "The command will return a result of 3 (empty) if the client",
-        "class doesn't exist. If the client class exists, the returned",
-        "result is 0 if the deletion was successful and the result is 1",
-        "if the deletion is unsuccessful."
-=======
         "The command returns a result of 3 (empty) if the client class does not exist. If the client class exists, the returned result is 0 if the deletion was successful; the result is 1 if the deletion is unsuccessful."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json
index e5731e05b6..cfd7c82bca 100644
--- a/doc/sphinx/api/class-update.json
+++ b/doc/sphinx/api/class-update.json
@@ -26,14 +26,7 @@
     "hook": "class_cmds",
     "name": "class-update",
     "resp-comment": [
-<<<<<<< HEAD
-        "The command will return the result of 3 (empty) if the client",
-        "class doesn't exist. If the client class exists, the returned",
-        "result is 0 if the update was successful and the result is 1",
-        "if the update is unsuccessful."
-=======
-        "The command returns the result of 3 (empty) if the client class does not exist. If the client class exists, the returned result is 0 if the update was successful or 1 if the update is unsuccessful."
->>>>>>> Fix grammar, typos, a few JSON errors
+        "The command returns the result of 3 (empty) if the client class does not exist. If the client class exists, the returned result is 0 if the update was successful, or 1 if the update is unsuccessful."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-global-parameter4-get.json b/doc/sphinx/api/remote-global-parameter4-get.json
index 0e29608a06..59b90e2026 100644
--- a/doc/sphinx/api/remote-global-parameter4-get.json
+++ b/doc/sphinx/api/remote-global-parameter4-get.json
@@ -1,11 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-<<<<<<< HEAD
-        "This command is used to fetch the selected global parameter for the server from the specified database."
-=======
         "This command fetches the selected global parameter for the server from the specified database."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-comment": [
         "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it fetches the global parameter value shared by all servers."
diff --git a/doc/sphinx/api/remote-global-parameter6-get.json b/doc/sphinx/api/remote-global-parameter6-get.json
index 477dee861c..c6bdfef022 100644
--- a/doc/sphinx/api/remote-global-parameter6-get.json
+++ b/doc/sphinx/api/remote-global-parameter6-get.json
@@ -1,11 +1,7 @@
 {
     "avail": "1.6.0",
     "brief": [
-<<<<<<< HEAD
-        "This command is used to fetch the selected global parameter for the server from the specified database."
-=======
         "This command fetches the selected global parameter for the server from the specified database."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-comment": [
         "This command carries a list including exactly one name of the parameter to be fetched. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error. The server tag \"all\" is allowed; it fetches the global parameter value shared by all servers."
diff --git a/doc/sphinx/api/remote-network4-list.json b/doc/sphinx/api/remote-network4-list.json
index e315b96ebd..2ea0c3bb07 100644
--- a/doc/sphinx/api/remote-network4-list.json
+++ b/doc/sphinx/api/remote-network4-list.json
@@ -4,11 +4,7 @@
         "This command fetches a list of all IPv4 shared networks from the configuration database."
     ],
     "cmd-comment": [
-<<<<<<< HEAD
-        "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
-=======
         "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-network6-list.json b/doc/sphinx/api/remote-network6-list.json
index 578d826916..1b88d4c816 100644
--- a/doc/sphinx/api/remote-network6-list.json
+++ b/doc/sphinx/api/remote-network6-list.json
@@ -4,11 +4,7 @@
         "This command fetches a list of all IPv6 shared networks from the configuration database."
     ],
     "cmd-comment": [
-<<<<<<< HEAD
-        "The ``server-tags`` list is required for this command and must not be empty. It may either contain one or multiple server tags as strings or a single ``null`` value."
-=======
         "The ``server-tags`` list is required for this command, and must not be empty. It may either contain one or multiple server tags as strings, or a single ``null`` value."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def4-del.json b/doc/sphinx/api/remote-option-def4-del.json
index 099ffdb211..a1cba34c8b 100644
--- a/doc/sphinx/api/remote-option-def4-del.json
+++ b/doc/sphinx/api/remote-option-def4-del.json
@@ -4,11 +4,7 @@
         "This command deletes a DHCPv4 option definition from the configuration database."
     ],
     "cmd-comment": [
-<<<<<<< HEAD
-        "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
-=======
         "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/remote-option-def6-del.json b/doc/sphinx/api/remote-option-def6-del.json
index 6ee611365c..81c9121ab4 100644
--- a/doc/sphinx/api/remote-option-def6-del.json
+++ b/doc/sphinx/api/remote-option-def6-del.json
@@ -4,11 +4,7 @@
         "This command deletes a DHCPv6 option definition from the configuration database."
     ],
     "cmd-comment": [
-<<<<<<< HEAD
-        "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and it must contain exactly one server tag. Specifying an empty list, a value of ``null`` or multiple server tags will result in an error."
-=======
         "This command includes a list with exactly one option definition specification, comprising an option name and code. The ``server-tags`` list is mandatory and must contain exactly one server tag. Specifying an empty list, a value of ``null``, or multiple server tags will result in an error."
->>>>>>> Fix grammar, typos, a few JSON errors
     ],
     "cmd-syntax": [
         "{",
-- 
GitLab


From 6b749afadd2959d0619b2295ba14a3d5e47d824a Mon Sep 17 00:00:00 2001
From: Suzanne Goldlust <sgoldlust@isc.org>
Date: Sat, 10 Aug 2019 01:14:11 -0400
Subject: [PATCH 09/13] Fix JSON errors

---
 doc/sphinx/api/build-report.json | 2 +-
 doc/sphinx/api/dhcp-enable.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/sphinx/api/build-report.json b/doc/sphinx/api/build-report.json
index 39ed952075..97d900b002 100644
--- a/doc/sphinx/api/build-report.json
+++ b/doc/sphinx/api/build-report.json
@@ -5,7 +5,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"build-report\",",
+        "    \"command\": \"build-report\"",
         "}"
     ],
     "name": "build-report",
diff --git a/doc/sphinx/api/dhcp-enable.json b/doc/sphinx/api/dhcp-enable.json
index c51c222b9b..5702fd0f26 100644
--- a/doc/sphinx/api/dhcp-enable.json
+++ b/doc/sphinx/api/dhcp-enable.json
@@ -5,7 +5,7 @@
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"dhcp-enable\",",
+        "    \"command\": \"dhcp-enable\"",
         "}"
     ],
     "description": "See <xref linkend=\"command-dhcp-enable\"/>",
-- 
GitLab


From ab2517b72c11530be045b529dbd1fe94ea2916c4 Mon Sep 17 00:00:00 2001
From: Suzanne Goldlust <sgoldlust@isc.org>
Date: Tue, 13 Aug 2019 14:11:45 -0400
Subject: [PATCH 10/13] Edited header underlines to try to get all the hooks
 libraries at the same TOC level in the docs

---
 doc/sphinx/arm/hooks.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst
index 573fe6a6fd..8400b99194 100644
--- a/doc/sphinx/arm/hooks.rst
+++ b/doc/sphinx/arm/hooks.rst
@@ -448,7 +448,7 @@ The libraries developed by ISC are described in detail in the following
 sections.
 
 user_chk: Checking User Access
-------------------------------
+==============================
 
 The user_chk library is the first hooks library published by ISC. It
 serves several purposes:
@@ -525,7 +525,7 @@ some pointers on how to extend this library and perhaps even write one
 from scratch.
 
 legal_log: Forensic Logging Hooks
----------------------------------
+=================================
 
 This section describes the forensic log hooks library. This library
 provides hooks that record a detailed log of lease assignments and
@@ -934,7 +934,7 @@ from a CQL database:
 .. _flex-id:
 
 flex_id: Flexible Identifiers for Host Reservations
----------------------------------------------------
+===================================================
 
 This section describes a hook application dedicated to generate flexible
 identifiers for host reservations. The Kea software provides a way to handle
@@ -1161,7 +1161,7 @@ In the DHCPv6 case, the corresponding query will look similar to this:
 .. _host-cmds:
 
 host_cmds: Host Commands
-------------------------
+========================
 
 This section describes a hook application that offers a number of new
 commands used to query and manipulate host reservations. Kea provides a
@@ -1709,7 +1709,7 @@ an error. Example results look as follows:
 .. _subnet-cmds:
 
 subnet_cmds: Subnet Commands
-----------------------------
+============================
 
 This section describes a hook application that offers some new
 commands used to query and manipulate subnet and shared network
-- 
GitLab


From e90577743ee528a7d5abddfb6fbd8ce8645a5cbb Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 16 Aug 2019 19:10:56 +0200
Subject: [PATCH 11/13] [#810,!471] Compilation fixes in the API files

---
 doc/sphinx/api/cache-get-by-id.json           | 2 +-
 doc/sphinx/api/cache-insert.json              | 2 +-
 doc/sphinx/api/cache-remove.json              | 2 +-
 doc/sphinx/api/class-add.json                 | 2 +-
 doc/sphinx/api/ha-scopes.json                 | 2 +-
 doc/sphinx/api/remote-option6-global-get.json | 2 +-
 doc/sphinx/api/reservation-get-all.json       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/sphinx/api/cache-get-by-id.json b/doc/sphinx/api/cache-get-by-id.json
index 14c0b454ab..ef6bf34c80 100644
--- a/doc/sphinx/api/cache-get-by-id.json
+++ b/doc/sphinx/api/cache-get-by-id.json
@@ -8,7 +8,7 @@
         "    \"command\": \"cache-get-by-id\",",
         "    \"arguments\": {",
         "        \"hw-address\": \"01:02:03:04:05:06\"",
-        "    }"
+        "    }",
         "}"
     ],
     "hook": "host_cache",
diff --git a/doc/sphinx/api/cache-insert.json b/doc/sphinx/api/cache-insert.json
index 2cf5db5d47..cdcfe6a25f 100644
--- a/doc/sphinx/api/cache-insert.json
+++ b/doc/sphinx/api/cache-insert.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command manually inserts a host into the cache."
+        "This command inserts a host into the cache."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/cache-remove.json b/doc/sphinx/api/cache-remove.json
index b824647f05..697b94f59a 100644
--- a/doc/sphinx/api/cache-remove.json
+++ b/doc/sphinx/api/cache-remove.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "This command works similarly to the ``reservation-get`` command."
+        "This command removes entries from the host cache. It takes parameters similar to the ``reservation-get`` command."
     ],
     "cmd-syntax": [
         "{",
diff --git a/doc/sphinx/api/class-add.json b/doc/sphinx/api/class-add.json
index 7e7ec01a29..1760ebd1dd 100644
--- a/doc/sphinx/api/class-add.json
+++ b/doc/sphinx/api/class-add.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.5.0",
     "brief": [
-        "This command creates and adds a new class to the existing server configuration."
+        "This command adds a new class to the existing server configuration."
     ],
     "cmd-comment": [
         "The ``next-server``, ``server-hostname``, and ``boot-file-name`` are DHCPv4-specific. Only one client class can be added with a single command. "
diff --git a/doc/sphinx/api/ha-scopes.json b/doc/sphinx/api/ha-scopes.json
index 54f8300bb9..28c815afa7 100644
--- a/doc/sphinx/api/ha-scopes.json
+++ b/doc/sphinx/api/ha-scopes.json
@@ -12,7 +12,7 @@
         "    \"service\": [ <service, typically 'dhcp4' or 'dhcp6'> ],",
         "    \"arguments\": {",
         "        \"scopes\": [ \"HA_server1\", \"HA_server2\" ]",
-        "    }"
+        "    }",
         "}"
     ],
     "description": "See <xref linkend=\"command-ha-scopes\"/>",
diff --git a/doc/sphinx/api/remote-option6-global-get.json b/doc/sphinx/api/remote-option6-global-get.json
index c790a43f7f..ff05da98cb 100644
--- a/doc/sphinx/api/remote-option6-global-get.json
+++ b/doc/sphinx/api/remote-option6-global-get.json
@@ -20,7 +20,7 @@
         "            <specification of the database to connect to>",
         "        },",
         "        \"server-tags\": [ <single server tag as string> ]",
-        "    }"
+        "    }",
         "}"
     ],
     "hook": "cb_cmds",
diff --git a/doc/sphinx/api/reservation-get-all.json b/doc/sphinx/api/reservation-get-all.json
index 6f5094b41f..15b8092021 100644
--- a/doc/sphinx/api/reservation-get-all.json
+++ b/doc/sphinx/api/reservation-get-all.json
@@ -8,7 +8,7 @@
         "    \"command\": \"reservation-get-all\",",
         "    \"arguments\": {",
         "        \"subnet-id\": <integer>",
-        "    }"
+        "    }",
         "}"
     ],
     "hook": "host_cmds",
-- 
GitLab


From f1ae84186beb54d45f8455236827108289b0b0d6 Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 16 Aug 2019 19:58:41 +0200
Subject: [PATCH 12/13] [#810,!471] Changed title levels in hooks-*.rst files

 - mostly --- to ~~~
---
 doc/sphinx/arm/hooks-cb-cmds.rst    |  4 ++--
 doc/sphinx/arm/hooks-class-cmds.rst | 13 +++++++-----
 doc/sphinx/arm/hooks-ha.rst         | 32 ++++++++++++++---------------
 doc/sphinx/arm/hooks-host-cache.rst | 18 ++++++++--------
 doc/sphinx/arm/hooks-lease-cmds.rst |  2 +-
 doc/sphinx/arm/hooks-radius.rst     |  4 ++--
 doc/sphinx/arm/hooks-stat-cmds.rst  |  2 +-
 7 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/doc/sphinx/arm/hooks-cb-cmds.rst b/doc/sphinx/arm/hooks-cb-cmds.rst
index 633abee0b9..32a6f454ff 100644
--- a/doc/sphinx/arm/hooks-cb-cmds.rst
+++ b/doc/sphinx/arm/hooks-cb-cmds.rst
@@ -22,7 +22,7 @@ support contract.
    ``kea-dhcp6`` process.
 
 Commands Structure
-------------------
+~~~~~~~~~~~~~~~~~~
 
 There are 5 types of commands supported by this library:
 
@@ -78,7 +78,7 @@ the configuration of the server receiving the command.
 .. _cb-cmds-dhcp:
 
 Control Commands for DHCP Servers
----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This section describes and gives some examples of the control commands
 implemented by the ``cb_cmds`` hooks library, to manage the
diff --git a/doc/sphinx/arm/hooks-class-cmds.rst b/doc/sphinx/arm/hooks-class-cmds.rst
index 653871820a..6cef88a931 100644
--- a/doc/sphinx/arm/hooks-class-cmds.rst
+++ b/doc/sphinx/arm/hooks-class-cmds.rst
@@ -20,7 +20,7 @@ customers with a paid support contract.
 .. _command-class-add:
 
 The class-add Command
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 The ``class-add`` command adds a new client class to the DHCP server
 configuration. This class is appended at the end of the list of classes
@@ -62,7 +62,7 @@ Here is the response to the ``class-add`` command in our example:
 .. _command-class-update:
 
 The class-update Command
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ``class-update`` command updates an existing client class in the
 DHCP server configuration. If the client class with the given name
@@ -111,7 +111,8 @@ the new name will be added at the end of the list of configured classes.
 .. _command-class-del:
 
 The class-del Command
----------------------
+~~~~~~~~~~~~~~~~~~~~~
+
 
 The ``class-del`` command is used to remove a particular class from the server
 configuration. The class to be removed is identified by name. The class
@@ -146,7 +147,8 @@ If the class does not exist, the result of 3 is returned.
 .. _command-class-list:
 
 The class-list Command
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
+
 
 ``class-list`` is used to retrieve a list of all client classes. This
 command includes no arguments:
@@ -184,7 +186,8 @@ merely class names. To retrieve full class information, the
 .. _command-class-get:
 
 The class-get Command
----------------------
+~~~~~~~~~~~~~~~~~~~~~
+
 
 ``class-get`` is used to retrieve detailed information about a specified
 class. The command structure is very simple:
diff --git a/doc/sphinx/arm/hooks-ha.rst b/doc/sphinx/arm/hooks-ha.rst
index 1c4041cf53..7570278ab5 100644
--- a/doc/sphinx/arm/hooks-ha.rst
+++ b/doc/sphinx/arm/hooks-ha.rst
@@ -41,7 +41,7 @@ The following sections describe the configuration and operation of the
 Kea HA hook library.
 
 Supported Configurations
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 The Kea HA hook library supports two configurations, also known as HA
 modes: load-balancing and hot-standby. In the load-balancing mode, two
@@ -92,7 +92,7 @@ responses, because not only do active servers send lease updates to each
 other, but also to the backup servers.
 
 Clocks on Active Servers
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 Synchronized clocks are essential for the HA setup to operate reliably.
 The servers share lease information via lease updates and during
@@ -128,7 +128,7 @@ clocks and restart the servers.
 .. _ha-server-states:
 
 Server States
--------------
+~~~~~~~~~~~~~
 
 .. _command-ha-heartbeat:
 
@@ -303,7 +303,7 @@ for more details).
 .. _ha-scope-transition:
 
 Scope Transition in a Partner-Down Case
----------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When one of the servers finds that its partner is unavailable, it starts
 serving clients from both its own scope and the scope of the unavailable
@@ -334,7 +334,7 @@ back to the correct server via the rebinding mechanism.
 .. _ha-load-balancing-config:
 
 Load-Balancing Configuration
-----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following is the configuration snippet to enable high availability
 on the primary server within the load-balancing configuration. The same
@@ -515,7 +515,7 @@ available, ``server1`` will allocate the lease from the pool of
 .. _ha-load-balancing-advanced-config:
 
 Load Balancing with Advanced Classification
--------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 In the previous section, we provided an example of a load-balancing
 configuration with client classification limited to the ``HA_server1``
@@ -622,7 +622,7 @@ expression and class dependencies.
 .. _ha-hot-standby-config:
 
 Hot-Standby Configuration
--------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following is an example configuration of the primary server in the
 hot-standby configuration:
@@ -703,7 +703,7 @@ hot-standby and load-balancing modes of operation.
 .. _ha-sharing-lease-info:
 
 Lease Information Sharing
--------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 An HA-enabled server informs its active partner about allocated or
 renewed leases by sending appropriate control commands, and the partner
@@ -784,7 +784,7 @@ designed to maximize flexibility of administration.
 .. _ha-syncing-page-limit:
 
 Controlling Lease-Page Size Limit
----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 An HA-enabled server initiates synchronization of the lease database
 after downtime or upon receiving the ``ha-sync`` command. The server
@@ -807,7 +807,7 @@ less than 10000 lines.
 .. _ha-syncing-timeouts:
 
 Timeouts
---------
+~~~~~~~~
 
 In deployments with a large number of clients connected to the network,
 lease-database synchronization after a server failure may be a
@@ -885,7 +885,7 @@ the Kea source at: ``src/lib/config/timeouts.h``.
 .. _ha-pause-state-machine:
 
 Pausing the HA State Machine
-----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The high-availability state machine includes many different states
 described in detail in :ref:`ha-server-states`. The server
@@ -1063,7 +1063,7 @@ states anyway.
 .. _ha-ctrl-agent-config:
 
 Control Agent Configuration
----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :ref:`kea-ctrl-agent` describes in detail the Kea daemon, which
 provides a RESTful interface to control the Kea servers. The same
@@ -1102,7 +1102,7 @@ load-balancing and the hot-standby cases presented in previous sections.
 .. _ha-control-commands:
 
 Control Commands for High Availability
---------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Even though the HA hook library is designed to automatically resolve
 issues with DHCP service interruptions by redirecting the DHCP traffic
@@ -1124,7 +1124,7 @@ library which are available for the administrator.
 .. _command-ha-sync:
 
 The ha-sync Command
-~~~~~~~~~~~~~~~~~~~
+-------------------
 
 The ``ha-sync`` command instructs the server to synchronize its local
 lease database with the selected peer. The server fetches all leases
@@ -1172,7 +1172,7 @@ database inconsistencies.
 .. _command-ha-scopes:
 
 The ha-scopes Command
-~~~~~~~~~~~~~~~~~~~~~
+---------------------
 
 This command allows modification of the HA scopes that the server is
 serving. Consult :ref:`ha-load-balancing-config` and
@@ -1207,7 +1207,7 @@ specify an empty list:
 .. _command-ha-continue:
 
 The ha-continue Command
-~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------
 
 This command is used to resume the operation of the paused HA state
 machine, as described in :ref:`ha-pause-state-machine`. It takes no arguments, so the
diff --git a/doc/sphinx/arm/hooks-host-cache.rst b/doc/sphinx/arm/hooks-host-cache.rst
index 60aad0168f..f294bdcb88 100644
--- a/doc/sphinx/arm/hooks-host-cache.rst
+++ b/doc/sphinx/arm/hooks-host-cache.rst
@@ -54,7 +54,7 @@ available.
 .. _command-cache-flush:
 
 The cache-flush Command
------------------------
+~~~~~~~~~~~~~~~~~~~~~~~
 
 This command allows removal of a specified number of cached host
 entries. It takes one parameter, which defines the number of hosts to be
@@ -74,7 +74,7 @@ hosts, please use cache-clear instead. The hosts are stored in FIFO
 .. _command-cache-clear:
 
 The cache-clear Command
------------------------
+~~~~~~~~~~~~~~~~~~~~~~~
 
 This command allows removal of all cached host entries. An example usage
 looks as follows:
@@ -91,7 +91,7 @@ number of cached hosts, please use cache-flush instead.
 .. _command-cache-size:
 
 The cache-size Command
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
 
 This command returns the number of host entries. An example usage looks
 as follows:
@@ -105,7 +105,7 @@ as follows:
 .. _command-cache-write:
 
 The cache-write Command
------------------------
+~~~~~~~~~~~~~~~~~~~~~~~
 
 In general, the cache content is considered a runtime state and the
 server can be shut down or restarted as usual; the cache will then be
@@ -135,7 +135,7 @@ processed by any other tool that is able to understand JSON format.
 .. _command-cache-load:
 
 The cache-load Command
-----------------------
+~~~~~~~~~~~~~~~~~~~~~~
 
 See the previous section for a discussion of use cases where it may be
 useful to write and load contents of the host cache to disk.
@@ -158,7 +158,7 @@ processed by any other tool that is able to understand JSON format.
 .. _command-cache-get:
 
 The cache-get Command
----------------------
+~~~~~~~~~~~~~~~~~~~~~
 
 This command is similar to cache-write, but instead of writing the cache
 contents to disk, it returns the contents to whoever sent the command.
@@ -179,7 +179,7 @@ may be large.
 .. _command-cache-get-by-id:
 
 The cache-get-by-id Command
----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This command is similar to cache-get, but instead of returning the whole
 content it returns only the entries matching the given identifier.
@@ -202,7 +202,7 @@ address.
 .. _command-cache-insert:
 
 The cache-insert Command
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 This command may be used to manually insert a host into the cache; there
 are very few use cases when this command might be useful. This command
@@ -263,7 +263,7 @@ looks as follows:
 .. _command-cache-remove:
 
 The cache-remove Command
-------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 Sometimes it is useful to remove a single entry from the host cache. A
 good use case is a situation where the device is up, Kea has already
diff --git a/doc/sphinx/arm/hooks-lease-cmds.rst b/doc/sphinx/arm/hooks-lease-cmds.rst
index fd8da1042d..639388fae7 100644
--- a/doc/sphinx/arm/hooks-lease-cmds.rst
+++ b/doc/sphinx/arm/hooks-lease-cmds.rst
@@ -100,7 +100,7 @@ servers.
 .. _command-lease6-add:
 
 The lease4-add, lease6-add Commands
------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ``lease4-add`` and ``lease6-add`` commands allow for the creation of
 a new lease. Typically Kea creates a lease when it first sees a new
diff --git a/doc/sphinx/arm/hooks-radius.rst b/doc/sphinx/arm/hooks-radius.rst
index 4cabdbc0c2..db5cdc1fe6 100644
--- a/doc/sphinx/arm/hooks-radius.rst
+++ b/doc/sphinx/arm/hooks-radius.rst
@@ -44,7 +44,7 @@ specified for a particular class.
 .. _hooks-radius-install:
 
 Compilation and Installation of the RADIUS Hook
------------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following section describes how to compile and install the software
 on CentOS 7.0. Other systems may differ slightly.
@@ -289,7 +289,7 @@ option is recommended to speed up the build.
 .. _hooks-radius-config:
 
 RADIUS Hook Configuration
--------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The RADIUS hook is a library that has to be loaded by either DHCPv4 or
 DHCPv6 Kea servers. Unlike some other available hooks libraries, this one
diff --git a/doc/sphinx/arm/hooks-stat-cmds.rst b/doc/sphinx/arm/hooks-stat-cmds.rst
index befa004465..3526f6171c 100644
--- a/doc/sphinx/arm/hooks-stat-cmds.rst
+++ b/doc/sphinx/arm/hooks-stat-cmds.rst
@@ -62,7 +62,7 @@ configuration, Kea will not retrieve statistics for it.
 .. _command-stat-lease6-get:
 
 The stat-lease4-get, stat-lease6-get Commands
----------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The ``stat-lease4-get`` and ``stat-lease6-get`` commands fetch lease
 statistics for a range of known subnets. The range of subnets is
-- 
GitLab


From 2e88e2554905dd66b9974c9fc513ee7e7b825a46 Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 16 Aug 2019 20:01:09 +0200
Subject: [PATCH 13/13] [#810,!471] AUTHORS, ChangeLog updated

---
 AUTHORS   | 1 +
 ChangeLog | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 0f59b9f56c..4e8812ed5e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,7 @@ Primary developers:
  - Shawn Routhier (lease file cleanup)
  - Michal Nowikowski (testing, hammer, release engineering)
  - Razvan Becheriu (cassandra, sysrepo)
+ - Suzanne Goldlust (documentation)
 
 Primary area of work mentioned in parentheses. The list is in a roughly
 chronological order.
diff --git a/ChangeLog b/ChangeLog
index 370d67735e..0ee43e56c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1649.	[doc]		sgoldlust
+	API documentation updated and cleaned up.
+	(Gitlab #810,!471, git f1ae84186beb54d45f8455236827108289b0b0d6)
+
 1648.	[func]		fdupont,marcin
 	Client classification information (client-class,
 	require-client-classes) and excluded prefix (excluded-prefix,
-- 
GitLab