diff --git a/AUTHORS b/AUTHORS
index 0f59b9f56c2df0122ddb1b7de1d2b5c9023060b3..4e8812ed5e0a62d8caa4339e9e03bfe46d66b295 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 370d67735e89eab8681703a9f395ccbc01d911c1..0ee43e56c5275507883a0c14ac210620a0e093f2 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,
diff --git a/doc/sphinx/api/build-report.json b/doc/sphinx/api/build-report.json
index fb3d25f45724ca3c1dd23ffc7d7eef0addd8d061..97d900b0028dac2e6d54bc29b0314a2a91fee29e 100644
--- a/doc/sphinx/api/build-report.json
+++ b/doc/sphinx/api/build-report.json
@@ -1,7 +1,7 @@
 {
     "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": [
         "{",
@@ -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 10a24a990a71612d6e22ad9a42467a0721f73f27..ef6bf34c80c0e5a980f9ea73f1899e6d465a2c53 100644
--- a/doc/sphinx/api/cache-get-by-id.json
+++ b/doc/sphinx/api/cache-get-by-id.json
@@ -1,21 +1,22 @@
 {
     "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": [
         "{",
         "    \"command\": \"cache-get-by-id\",",
         "    \"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 3c27a1121831671c47c51b2b013c3a46d92315e0..b7af01d0f29dbe7b61231e3a1ade020f7c4f225c 100644
--- a/doc/sphinx/api/cache-get.json
+++ b/doc/sphinx/api/cache-get.json
@@ -1,14 +1,14 @@
 {
     "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",
     "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 64c9bc6565d607711c337307c6237550d7e9cf8e..cdcfe6a25fa6b85eccd82e2d30fccd101c6691fe 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 inserts a host into the cache."
     ],
     "cmd-syntax": [
         "{",
@@ -49,4 +49,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/cache-load.json b/doc/sphinx/api/cache-load.json
index 823a471f4a52865d9fc3c608a7bab698a3751793..3932dac9fc9c21b1e9ca8ec95de991f6882569e9 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 c3ad0f644a1ce8cc075077d14c595e37e9a3a6c2..697b94f59a248edabc9a72738ad445d8bffed115 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 removes entries from the host cache. It takes parameters similar 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 b5340733d47848dc64df3e676b4b88cd1e41290a..48681fcd0d617222b0c18c889ef463f692dcabc1 100644
--- a/doc/sphinx/api/cache-size.json
+++ b/doc/sphinx/api/cache-size.json
@@ -1,14 +1,14 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "Returns number of entries of the host cache."
+        "This command returns the number of entries in the host cache."
     ],
     "hook": "host_cache",
     "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/cache-write.json b/doc/sphinx/api/cache-write.json
index baa015f4f8eca927687d70fb369faf7457ba558c..6c8c15b41b7582d4d96b4705ca6b7d81668a6a2c 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 611f1a490cb6b7fa04df5e681c7d63caa530ca44..1760ebd1dd751ac14c1abb9085e291e2d914a72d 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 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": [
         "{",
@@ -16,7 +14,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>",
@@ -28,13 +26,12 @@
     "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": [
         "{",
         "    \"result\": 0,",
-        "    \"text\": \"Class '<class-name>' added.\",",
+        "    \"text\": \"Class '<class-name>' added.\"",
         "}"
     ],
     "support": [
diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json
index 069952392abb8b92e54c8efe7d659f554c6f2024..4635563311865df827d1b675f1db0bb9ffe2488b 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,7 @@
     "hook": "class_cmds",
     "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",
-        "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."
     ],
     "resp-syntax": [
         "{",
diff --git a/doc/sphinx/api/class-get.json b/doc/sphinx/api/class-get.json
index 00c9738d93ff78fca1680d3131be3f9a17fb3dc0..648bd001343d301b570bb01bc96c42c10b8998df 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 36486cbfd3bf83c8e876c08e0dd1d591f470a6ac..b0e3f6bfa1ced3a8b006c9735f7374d9ce26b962 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.",
@@ -28,7 +27,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 dd8d67baf833722183938a42be18a5dc427a395d..cfd7c82bca9e9c31b96e6a1d00b3563190a4999c 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": [
         "{",
@@ -16,7 +14,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>",
@@ -28,15 +26,12 @@
     "hook": "class_cmds",
     "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",
-        "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."
     ],
     "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 2bee41388ad9571e10a121958dbdafb9d4eb48b2..6fca9a2b3d5a8982bbcb2f37112444bf85e31dc9 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."
@@ -18,7 +16,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-reload.json b/doc/sphinx/api/config-reload.json
index ac9e5e759a4b417f0407b33d092cea31bd3bba18..bfd67c4f9f0bb785546b02c3eb383219fec299dd 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 02fc74a7cfe498aaeccfc5bfda3a86fc5bb4aa6b..6e81cb6d62382002b9a97fa46b1b622a81c01969 100644
--- a/doc/sphinx/api/config-set.json
+++ b/doc/sphinx/api/config-set.json
@@ -1,16 +1,16 @@
 {
     "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": [
         "{",
         "    \"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 335d06e9dbf3854dda0dcae2728d1b69fb0f7c09..100e3bf906afcbbc89461c16f2a77bbe4334c143 100644
--- a/doc/sphinx/api/config-test.json
+++ b/doc/sphinx/api/config-test.json
@@ -1,16 +1,16 @@
 {
     "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": [
         "{",
         "    \"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/config-write.json b/doc/sphinx/api/config-write.json
index 490dc7d28d446ed04f7c4b11dc6a9dd8285ce88d..0c4b9168800a21a1cb1195adc76b0ed3655170ed 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 acb56c8c715d5754303de0651b1a400a882c3525..8e7bbfe987229c3b26d38dc0b6a0392f3923cfe7 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 d4e64beb714d02fbbaa435deb204514992d19e06..5702fd0f26cbcc6363cfbd53d959d3e669079e4d 100644
--- a/doc/sphinx/api/dhcp-enable.json
+++ b/doc/sphinx/api/dhcp-enable.json
@@ -1,7 +1,7 @@
 {
     "avail": "1.4.0",
     "brief": [
-        "The dhcp-enable command globally enables the DHCP service."
+        "This command globally enables the DHCP service."
     ],
     "cmd-syntax": [
         "{",
@@ -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 cac25680b8dfd940e0486453fd48d4ae53a23baf..b20caf148b7819905378dfbe2800b5b3b9da4109 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 c1eed190e6719d938aade43bb307959000e5d552..15d5514c5e91cd41b59522fda5aba25a9926af5e 100644
--- a/doc/sphinx/api/ha-heartbeat.json
+++ b/doc/sphinx/api/ha-heartbeat.json
@@ -1,19 +1,18 @@
 {
     "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": [
         "{",
-        "    \"command\": \"ha-heartbeat\",",
+        "    \"command\": \"ha-heartbeat\"",
         "    }"
     ],
     "description": "See <xref linkend=\"ha-server-states\"/>",
     "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/ha-scopes.json b/doc/sphinx/api/ha-scopes.json
index 889961d59330181ca064eea0715813ebb1cf3b26..28c815afa7e217d5eb936a75e09a1cc8716da064 100644
--- a/doc/sphinx/api/ha-scopes.json
+++ b/doc/sphinx/api/ha-scopes.json
@@ -4,15 +4,16 @@
         "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": [
         "{",
         "    \"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 52b34e40f547e56751952a9e79eae41aac9a182a..4aad91737bdee526068cf23b17344e84a39d378c 100644
--- a/doc/sphinx/api/ha-sync.json
+++ b/doc/sphinx/api/ha-sync.json
@@ -1,13 +1,12 @@
 {
     "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": [
         "{",
         "    \"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 27e079f721b8c5c3063b9501b6ac414ee8eee713..daf666db92a03f77cffd45e90c32dd129093916f 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": [
         "{",
@@ -21,4 +21,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/lease4-del.json b/doc/sphinx/api/lease4-del.json
index 5a829a2d08d7209bbbe684d9e6022410a13ee622..c7c3b13399dd7d430ad8766303d53f9baa3e5659 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 5c33b9d19de2dbf77c94614d984b64b984d0c03d..d8605370a7cf389973d297459a49c3eb3d2321b1 100644
--- a/doc/sphinx/api/lease4-get-all.json
+++ b/doc/sphinx/api/lease4-get-all.json
@@ -1,14 +1,14 @@
 {
     "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": [
         "{",
-        "    \"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/lease4-get.json b/doc/sphinx/api/lease4-get.json
index ca5f1392838ebba1c9798f65fce48497eb7ecdcf..b46194e80763affe0f667f2c9316990af0f1943a 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 ea2422a5b3fab5b2c4a57dfadd42f75c6199ee34..d974a532c7d1e9a65b60a926e6bf9d2ed4a388e0 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 1685a6d1c96f766d00518e00cd6e8c237d19082f..edb08ee1e8eb47ad6267e4e899521b32a616e44b 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 a8fd13fe5863f0a36b9c02e264a46b2090d432bb..e950e63d2b53ec533d1473563e38e1d10910033d 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": [
         "{",
@@ -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 7f0e42dd4782875c7d3c165c9dd78c4dcab895ab..a39926bcbb2135c1a10fc8ec61182aecaa1bd94e 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."
+        "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, 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,31 +42,29 @@
     "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, 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": [
-        " {",
-        "    {",
-        "        \"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/lease6-del.json b/doc/sphinx/api/lease6-del.json
index f82993029d0aeb7943c5720fb1de293cc1955ec6..e4f7c174914335243880b12cf403c7583afd7c86 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 01a4243dfad0b259b15fee838907ddd139d4c799..165cd05a297dba284549cf6746aaf7a2107b1f21 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 6ae039193c4b46f7d1f4b8df7b854088e11bb3cc..84e36a44ded96c141664c62f2e288298dd773b1f 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 767a59f95f65d3aca69c4030509560730c8bbe17..11671026349497b416d73f71367cd56525972179 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 74c2d7d16bb322b7509d35f87f403297319da512..8503841e683c47c43e3ec6bd103fb14989c9279c 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 095522a3f72d69f46e438d50f1ff74984950dff8..894c79e768e181e0532112a96a96fced09059197 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 b3a4c8ede26b727de4e468d3d2cda163440fe5cc..9c13c6c1181fee929edffd6151161fad426df3ac 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 61023c3929d3d0ddb39b121c2d514b87a52e8c54..d238a441cbb10bcc12591b6b407b772999672254 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 9450f3492aaaf31fd0555c4b336bc8f1e3a100d1..af180432a1853decbe7be5a7496bcf5c336c003f 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 8ae53ef1d2be0d2daa5e8962696ea29d28078526..2c11f4ebafe12aa259d37fa250376867b869ca68 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 a85de53d4d1144b1a10125da94e3f66a1986c1ec..bb8f792dfc91a271f04a3de438145d8e93bc38ab 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",
         "                },",
         "                {",
-        "                    \"id\": 6,",
         "                    \"subnet\": \"192.0.3.0/31\",",
-        "                    // many other subnet specific details here",
+        "                    \"id\": 6,",
+        "                    // many other subnet-specific details here",
         "                }",
         "            ],",
         "            \"valid-lifetime\": 120",
@@ -54,4 +54,4 @@
     "support": [
         "kea-dhcp4"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/network4-list.json b/doc/sphinx/api/network4-list.json
index 142d65e72819d329509c20be4aadc2b01a832e4b..535f64697b3add91a9257408e8f26bb183cce7dd 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 802d52115085c8f59570a98d7efaf5253fc41212..9b8c28f95c57a58271a60dc9a964e4e4385961fa 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 d8b76dd05866bbf4be47a21fbb5592dcd9c0bbd8..edfa5c51f4ceb014b3860b0578de49c466496bac 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 0280df5acb3dd72807ae8d7a101989bb939a886f..8f6139a7d10f227df0867b63ed3bb165b6afcdee 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 022fc1f02ea8c68069e16b144c45b90fb7b637f9..739e0fcfd0969f12ae7839a58924803e844f32b5 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 10dbfd6ebe7d228eeedc89c41441308299b04443..199aa9d6201fc68c78dcb4e33c7ee7e2821e83dd 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": [
         "{",
@@ -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/network6-list.json b/doc/sphinx/api/network6-list.json
index 6ccca085ebcfe469a659c5a78c8663454149b000..65a0890d33d7c843eb2087ec8e7ff2c20318b35c 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 110bf455ea0dc5e2af4fdf450d8d1417515eb987..c828d350514931a077fbb9dadfe408c33cde3072 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 31eb948fb9314ddca29cc64644daa07f287fdc07..1e157d1c9bd38a53f9b61abf23376f92a7320873 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 1fc907dfcb0e6d0d3041cf8284dd87b1c72df65d..531d039453206c1f870e45e006d137994097dd73 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 aa42d2eeabbe71e22da8af32ec5479372a9c3acc..246fae114b9127515cb36ae827b9f050f510e760 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 219ccd766f8813028ace9bddf500f3954b561b54..59b90e2026ffff88c400b63d7a1c5fbd6f3ab007 100644
--- a/doc/sphinx/api/remote-global-parameter4-get.json
+++ b/doc/sphinx/api/remote-global-parameter4-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected global parameter for the server from the specified database."
+        "This command fetches 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."
+        "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 +21,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 469026f0abf5eb00d4ad5ddc5d5f3a920a1f2ccd..de9af8a12ee43cb1f14380df4b4504e3dee143bb 100644
--- a/doc/sphinx/api/remote-global-parameter4-set.json
+++ b/doc/sphinx/api/remote-global-parameter4-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 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 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 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": [
         "{",
-        "    \"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-global-parameter6-del.json b/doc/sphinx/api/remote-global-parameter6-del.json
index 80bd95c2d617fe62791af836c8824260d52cd220..4c5a39ccb223725e3ec085fe53d1ac545314cf73 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 d2f8e144eb27b7b577db0609f8f567ac56d33e1f..ae08dc1163fdacf2df8f6d51ae0cf0b0b2737325 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 69a17d6b28e46b571bced9e1dd76273c98dd1a76..c6bdfef022526aa4f8c288e63630f52374b9b547 100644
--- a/doc/sphinx/api/remote-global-parameter6-get.json
+++ b/doc/sphinx/api/remote-global-parameter6-get.json
@@ -1,10 +1,10 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch selected global parameter for the server from the specified database."
+        "This command fetches 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."
+        "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 +21,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 436c9227f6ec3828e6992acaeff03f4825d0c861..b2d73f5f6256c437f567548f13777d349fd77404 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 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 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 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": [
         "{",
-        "    \"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-del.json b/doc/sphinx/api/remote-network4-del.json
index 28be9a35dbc63c349e98801c97357bf338a342de..7a54e02ffe1c3b531aca1f67638285eab8b98ada 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": [
         "{",
@@ -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 d5e0f22bf699a172f21b518a8a9ba84c2fd58551..5a15da7f0c4abdbdf7babb51a46a86080a53c5a9 100644
--- a/doc/sphinx/api/remote-network4-get.json
+++ b/doc/sphinx/api/remote-network4-get.json
@@ -1,21 +1,21 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch 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."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-network4-get\"",
+        "    \"command\": \"remote-network4-get\",",
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-include\": \"full\" | \"no\",",
+        "        \"subnets-include\": <'full' | 'no'>,",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
@@ -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 1cbe0e7527dab7092535cfd9361737b09b355ec1..2ea0c3bb078fbaaadab8c1bec9098e80f030aeed 100644
--- a/doc/sphinx/api/remote-network4-list.json
+++ b/doc/sphinx/api/remote-network4-list.json
@@ -1,14 +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": [
-        "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-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-network4-set.json b/doc/sphinx/api/remote-network4-set.json
index 232b46eb2eb6af541f6cf0106bdb82f77b2bba3c..1a4293f8ac7710f0f3a01d717dbff6f186582b38 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 db43e100d9f4b496577b74be50b7743dbc5b0978..63602db9da6d83c3716085bab33bf5255ccab883 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": [
         "{",
@@ -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 15665bc4ff0c3548493b40b0085a59bd26b33550..0bd5221249662586250913a23db02c07d44ac52a 100644
--- a/doc/sphinx/api/remote-network6-get.json
+++ b/doc/sphinx/api/remote-network6-get.json
@@ -1,21 +1,21 @@
 {
     "avail": "1.6.0",
     "brief": [
-        "This command is used to fetch 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."
     ],
     "cmd-syntax": [
         "{",
-        "    \"command\": \"remote-network6-get\"",
+        "    \"command\": \"remote-network6-get\",",
         "    \"arguments\": {",
         "        \"shared-networks\": [",
         "            {",
         "                \"name\": <shared network name>",
         "            }",
         "        ],",
-        "        \"subnets-include\": \"full\" | \"no\",",
+        "        \"subnets-include\": <'full' | 'no'>,",
         "        \"remote\": {",
         "            <specification of the database to connect to>",
         "        }",
@@ -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 f7605681ea186baf9f9e30388e04ac0921df88c2..1b88d4c8169733584bc3abc5aee02745f49acbc4 100644
--- a/doc/sphinx/api/remote-network6-list.json
+++ b/doc/sphinx/api/remote-network6-list.json
@@ -1,14 +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": [
-        "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-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-network6-set.json b/doc/sphinx/api/remote-network6-set.json
index 9643683a119466fd3b7adde83b64be0c86af3c96..d4bfad2b3113d22225e1846e46de183ca8a46193 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 6ac87975f295fe249abe0188f6dd0a5227200a3b..a1cba34c8b7075571a37bfc7baac3995bfc1d655 100644
--- a/doc/sphinx/api/remote-option-def4-del.json
+++ b/doc/sphinx/api/remote-option-def4-del.json
@@ -1,10 +1,10 @@
 {
     "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": [
-        "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."
     ],
     "cmd-syntax": [
         "{",
@@ -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-def4-get-all.json b/doc/sphinx/api/remote-option-def4-get-all.json
index d97e0030db497af6c3eed6f2bb841cd27de801f5..ea51b63ebb572b5b4aba863255f70af522e0cf42 100644
--- a/doc/sphinx/api/remote-option-def4-get-all.json
+++ b/doc/sphinx/api/remote-option-def4-get-all.json
@@ -1,14 +1,14 @@
 {
     "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 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-def4-get.json b/doc/sphinx/api/remote-option-def4-get.json
index f5f0ade55f2c23c00b27116ab6c9a59e47642663..cc37416d4769447cfc9704f7728d483289827e59 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 d819efa0ad44b34b6f9d6f69e91adda16c03f782..fc78615ba0080c967097d821ac5dd8c22d3cae9b 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 6ad13ddd0aca3a31ab21c67a798a584ece653473..81c9121ab40985ef34a00af2b94c808e3aa42b36 100644
--- a/doc/sphinx/api/remote-option-def6-del.json
+++ b/doc/sphinx/api/remote-option-def6-del.json
@@ -1,10 +1,10 @@
 {
     "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": [
-        "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."
     ],
     "cmd-syntax": [
         "{",
@@ -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-get-all.json b/doc/sphinx/api/remote-option-def6-get-all.json
index 5afa5a641b961bb370da0ce187d4dd9105d33fb0..c8cebfe02b8883d5a72e3e8e6b451b3c06642c79 100644
--- a/doc/sphinx/api/remote-option-def6-get-all.json
+++ b/doc/sphinx/api/remote-option-def6-get-all.json
@@ -1,14 +1,14 @@
 {
     "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 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-option-def6-get.json b/doc/sphinx/api/remote-option-def6-get.json
index 557a45fc797b46277d146d18ac4ea4e00d8c7e34..e0061ea370eb4f0d7a21f58055e8f431604e5224 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 5017a4d07e7dfa84fcaac206e2b70c026815e228..d9ff5c0949bc88ccb4055f4c3623de6a4ce9d190 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 f32a6b5f6f77885520082dc57ad4280678c4b59b..18933e6b31904c99a3324c6be2afd61054b0be4b 100644
--- a/doc/sphinx/api/remote-option4-global-del.json
+++ b/doc/sphinx/api/remote-option4-global-del.json
@@ -1,10 +1,10 @@
 {
     "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."
+        "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,7 +12,7 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": <option code>",
+        "                \"code\": <option code>,",
         "                \"space\": <option space>",
         "            }",
         "        ],",
diff --git a/doc/sphinx/api/remote-option4-global-get-all.json b/doc/sphinx/api/remote-option4-global-get-all.json
index 97a0eeabb5619158a32a01891521812f4b7f41d1..7ac4fd5c593a578e0a2aa8371d8c7fde76e5e7c7 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 09c4ac5e752025ea1d9ce3789211f38265639ae2..c5515dab658ebfd15a9d34850da207327469a651 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": [
         "{",
@@ -20,17 +20,18 @@
         "            <specification of the database to connect to>",
         "        },",
         "        \"server-tags\": [ <single server tag as string> ]",
+        "    }",
         "}"
     ],
     "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 9164db93c630d32e9ca27b56c09ce6f74839220e..fa1fd41bc90888b8f6f3b65301bbd772c19a9382 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 548959c2e341c57d514d27d6253476c3b0595b8e..9cf32bd96a5f453f393c8b3b2761df886647a280 100644
--- a/doc/sphinx/api/remote-option6-global-del.json
+++ b/doc/sphinx/api/remote-option6-global-del.json
@@ -1,10 +1,10 @@
 {
     "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."
+        "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,7 +12,7 @@
         "    \"arguments\": {",
         "        \"options\": [",
         "            {",
-        "                \"code\": <option code>",
+        "                \"code\": <option code>,",
         "                \"space\": <option space>",
         "            }",
         "        ],",
diff --git a/doc/sphinx/api/remote-option6-global-get-all.json b/doc/sphinx/api/remote-option6-global-get-all.json
index 6952f1694232e9e75894c7e6c1fb548eb7855a30..a0bf8607fdc930fe937f2cdcb7a60983963c8269 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 48354b7eabdee3d99d2bbefdc30861846c9cc64b..ff05da98cbfbe9530d8f142094ebadbc6e88b967 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": [
         "{",
@@ -20,17 +20,18 @@
         "            <specification of the database to connect to>",
         "        },",
         "        \"server-tags\": [ <single server tag as string> ]",
+        "    }",
         "}"
     ],
     "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 a32a5f55b1a4133127b246a5119e977e24408d33..6b9619af864e7537bad298b48c449eb28705d415 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 b9ec184e33736724fc1bcd4d722768f9b0560229..cc476168a22e52c74946c47e98d618b73880b639 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 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."
@@ -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-server4-get-all.json b/doc/sphinx/api/remote-server4-get-all.json
index f78b828fa1c9c718f795a5208c06515f1129fa75..b39e3322659bd40ccbe63b305fa6c5e5773dee8c 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 d9a0bfce246cc7409a2e4b774b46494da50f052e..8080a4df376beeb2cbe84d78679548f419ea6781 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."
@@ -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-server4-set.json b/doc/sphinx/api/remote-server4-set.json
index 75e32518484e5c230eb6c2daaa62bc49bf6f6c10..e81b6a79ecd4d7ce9f34634b80538d93414ff843 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 4e1f8798bd7a655034ec19ad845dd1385931c5b8..8ea350ff88e645b01de46a85169c2325b0e12a3e 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 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."
@@ -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-server6-get-all.json b/doc/sphinx/api/remote-server6-get-all.json
index 9f5c8aad8e643d60ae6bc985948a3cbe31df5960..d9b8c7e90bc954c1b9f7a0452b229fe0c4461213 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 3030b0b7f41a1a9f1ff59bb183cc3f676bdb04a3..99455d751b0d85200e3d33e74505f36708a0cc5d 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."
@@ -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/remote-server6-set.json b/doc/sphinx/api/remote-server6-set.json
index 7e890848bee557cea0ae4491524fb057f0e64857..024106065742902b71a6d1bced248e436bd246ea 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 e54309dc55d87297a033bb2954a339afeafe10bc..7037c76cc74c6e6640e3706dacf7a3b15f5f722e 100644
--- a/doc/sphinx/api/remote-subnet4-del-by-id.json
+++ b/doc/sphinx/api/remote-subnet4-del-by-id.json
@@ -1,10 +1,10 @@
 {
     "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."
+        "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-subnet4-del-by-prefix.json b/doc/sphinx/api/remote-subnet4-del-by-prefix.json
index 4099f5ad12ff1c54aac97eafc7b4cb36549d44df..bd16dee37b3d05421e8fca59568455d7c7ec7c2b 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 b5abe31f9bc8d414cfaac8df3259d5e2eebe4f50..706092e263546a8e70e4adf3ff05afcaf3fe0594 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 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."
+        "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 (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 c6093381a0293aec774cf01f0289f753bbf91f67..23e468585dac4b56d51930a15acde15d1a1a6728 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 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."
     ],
     "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 256047f06ae606e912106a2f24c040f64f950075..3226be93e15666275aecb942ec3a5b44e9df51e6 100644
--- a/doc/sphinx/api/remote-subnet4-list.json
+++ b/doc/sphinx/api/remote-subnet4-list.json
@@ -1,14 +1,14 @@
 {
     "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. 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-subnet4-set.json b/doc/sphinx/api/remote-subnet4-set.json
index dae774c37fec87993e40ddb0df73d0a4ae7a86f3..a2592501d8e1e2ccedeabdc2e6623cdd5d550aaa 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 367fd07e079b31fd5a3a9aa56f4ec613172afe76..d6ac7fab382aaff9d5a2581e54fcc22487b34aad 100644
--- a/doc/sphinx/api/remote-subnet6-del-by-id.json
+++ b/doc/sphinx/api/remote-subnet6-del-by-id.json
@@ -1,10 +1,10 @@
 {
     "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."
+        "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-prefix.json b/doc/sphinx/api/remote-subnet6-del-by-prefix.json
index c9f71ec57eeb2bf29a9019655dcb2e4aeae17c34..4752ac02076c93e2cb99ae58d44ae8322b32585b 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 0b992ef256c23e82e7b895fe2c8a66caf1aa42db..6e0622526345b8c3827872cc31aa964252157a3b 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 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."
+        "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 (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 b79d871cda63460bd20df558c1db26d74099db31..f4bea4a9ef62ff4fe1591e80b5658db56ca32822 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 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."
     ],
     "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 0e5db5a1f0630fa681bb6223b48eea2d6ba20c7e..f27b487e513cb8ac148c80e5ac56ee258e053d7e 100644
--- a/doc/sphinx/api/remote-subnet6-list.json
+++ b/doc/sphinx/api/remote-subnet6-list.json
@@ -1,14 +1,14 @@
 {
     "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. 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/remote-subnet6-set.json b/doc/sphinx/api/remote-subnet6-set.json
index ae5ec431c851784493ab03db20c9dc3681696ed0..3d657c97c4567ece7bb779643aedf35f9756b875 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 fb3c11e79194631f95bd791366156d95b9ad7d32..db6f73de67e76f6aafcc0f8ccad712836ebe34f9 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": [
         "{",
@@ -17,22 +12,22 @@
         "    \"arguments\": {",
         "        \"reservation\": {",
         "            \"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>",
         "        }",
         "    }",
         "}"
diff --git a/doc/sphinx/api/reservation-del.json b/doc/sphinx/api/reservation-del.json
index 20861cbe3a7ac755271fb90cbcbde468490227c7..087d5d780baa395fbfae9b9b007b0daf4b11e65a 100644
--- a/doc/sphinx/api/reservation-del.json
+++ b/doc/sphinx/api/reservation-del.json
@@ -1,10 +1,10 @@
 {
     "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 (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": [
         "{",
@@ -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 a45d515b40fa5c6036aa6096c5b4ab6410264fcf..15b8092021643d79b259ae1cd2f28105af4dd98e 100644
--- a/doc/sphinx/api/reservation-get-all.json
+++ b/doc/sphinx/api/reservation-get-all.json
@@ -1,22 +1,23 @@
 {
     "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": [
         "{",
         "    \"command\": \"reservation-get-all\",",
         "    \"arguments\": {",
         "        \"subnet-id\": <integer>",
+        "    }",
         "}"
     ],
     "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",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/reservation-get-page.json b/doc/sphinx/api/reservation-get-page.json
index d92756c53d6966e7522763271265bed7df22a826..507d609731b2fe2cf6f13cef19b385480f8f5e42 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 e1da525e35e44b64b80a83e0982a08308a343f2d..fa4ce9ed564536d887ad3374b16d4b24adc9dca5 100644
--- a/doc/sphinx/api/reservation-get.json
+++ b/doc/sphinx/api/reservation-get.json
@@ -1,26 +1,25 @@
 {
     "avail": "1.2.0",
     "brief": [
-        "Attempts to retrieve an existing host reservation"
+        "This command retrieves 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\": <string>;",
+        "        \"identifier-type\": <one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>,",
+        "        \"identifier\": <string>",
         "    }",
         "}"
     ],
     "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 +27,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 +50,4 @@
         "kea-dhcp4",
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/server-tag-get.json b/doc/sphinx/api/server-tag-get.json
index 26925c04561786de2f4d2d7733be4ea3dba0df7f..54d74a1e80dfcf9ced8a246896206e7620a068fd 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 5ebab230160d60acf118d36cf6033ec4ab97eeaf..f3c05835bb48e1ce4a0ac8250d4b892973293462 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/stat-lease4-get.json b/doc/sphinx/api/stat-lease4-get.json
index d0dc6212752cbfbaa119cd848ced60edcb52d0e3..7ddef1a2b0c657ba7c4807da1ef5aa7cdd16c1e8 100644
--- a/doc/sphinx/api/stat-lease4-get.json
+++ b/doc/sphinx/api/stat-lease4-get.json
@@ -1,8 +1,7 @@
 {
     "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": [
         "{",
@@ -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 000f5fd0750695cbef68b62509570ab73143f997..9c2a4309181fe00dffd7cd144f0651f3b837bec6 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,10 +20,10 @@
         "    \"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 ]",
+        "          [ 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/statistic-get-all.json b/doc/sphinx/api/statistic-get-all.json
index 83690cf70e4fdd5eda8723b5803927d1722d215f..5d10490b1bacc9e9ec4c815941934636b83c76e9 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 3b923d6bb9d53adaedb764f25a335539ef4cb59f..eb2d09f19b3e75077e882c66fff3227a2609e414 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 eb007a1cf4b3fc85ebf2b7007509ae0bc5512607..7f28fb7d06f2ab4e84c9f4e3eaf72773cdb14695 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 41a150afaa614ae7aed18e184f1bd46d2540a115..766956fdf1f68c18b8388408afb4a49af0e320d3 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 789bc279b69a62eb85ae274d89dd54f252bdbb98..4879b0a3b3fc5b82b348e96415ed634866fd56b6 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 5c094a5a002029fbc8557dd110c2e42d486f4f67..ee901c929fd460c4cb5aa2fa688fea38d0c1b6ec 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 343de3db1e88e74ef2eb04d1185def7feb7d4e2b..f94a4c027db2a3e07e08ab8dc46017390614d746 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 d94e8960c958c2e2f7efbe5ae60e2752f6ef2f1c..0b0932c182f70bc9355c8ef1febc06e70a6219af 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 41fc8c2839a70d1919a116b3d0cdec2d0c80efea..c5d8510bda03f47f4675ddb460da2312907b4d25 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 a8f8cccf729b79398354213eddcc672d2c3904c2..74bc9b3c45384c263c88b89edfd8ff21bf01578b 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 09b7d545cbe98f2a5f55418ecb751d19d1612593..57f61ca3d61acebe439fa8c61d878e13734f8040 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 16646da802aa6c754d3ba2dfdb1757f29b24c2f5..b019402f3d8ef839730525a0ef2e731270b0c04f 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 181f9cef4c66b7e0d795edafae41b593d4267cc9..80fcff1a7bf6cf4d28be84e2dc51f4691f5d2a16 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 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": [
         "{",
@@ -24,8 +24,8 @@
         "                \"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/subnet4-list.json b/doc/sphinx/api/subnet4-list.json
index 2184436e08ad5e9b7488c035953450b20054a0cd..4b9a6847b36272e99621077c7eadfe5f094a7687 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": [
         "{",
@@ -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/subnet4-update.json b/doc/sphinx/api/subnet4-update.json
index cc08248b649d446a2b99a15884ac58cea599d38d..d1424c4897e653a97c474bf80001806d2dda6438 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 38bdbc658f46c1e77a2aab4ba4ee32eaf7bfc5b2..96e8b505df3f4001ddbcb34dc584e80f2c483000 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 ec429f74eb2e0d157281a7ae41b2a4fb436c1b52..1b928a9e0f35b6c1bb92c97df4c3cdbbf461278d 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 03c5e77e077eeefa006527237d41eb3ae9b916a7..2692c382654c0eeb58035524a611fa76c37f656b 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 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,8 +25,8 @@
         "                \"id\": 1,",
         "                \"option-data\": [",
         "                    ...",
-        "                ]",
-        "                ....",
+        "                ],",
+        "                ...",
         "            }",
         "        ]",
         "    }",
@@ -35,4 +35,4 @@
     "support": [
         "kea-dhcp6"
     ]
-}
\ No newline at end of file
+}
diff --git a/doc/sphinx/api/subnet6-list.json b/doc/sphinx/api/subnet6-list.json
index f32937ac855931ec0b4d52e2ec44e59d8a7e0e99..08270afab25d77936862d4cba5629d690677d077 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": [
         "{",
@@ -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
+}
diff --git a/doc/sphinx/api/subnet6-update.json b/doc/sphinx/api/subnet6-update.json
index a2e9dc2c822f21b87bf2464c972946c2bc4f5e9e..94b34aab21295f0491f2a9a2c4192021c2c518ef 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 22027e5099eca6955f68f1f3982dc6d2a14e11c2..c44320cea9e20164fa536d8e71925bb1027d8dde 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": [
         "{",
diff --git a/doc/sphinx/arm/hooks-cb-cmds.rst b/doc/sphinx/arm/hooks-cb-cmds.rst
index 633abee0b9394c52c4d55ff2ae06e98b58527756..32a6f454ff6234df088c469acf64298ec20ac2a2 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 653871820a8bfaff9a1c2aa1f4925651c4ac4857..6cef88a93170f4893c178ea34eba5abecf6b2114 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 1c4041cf53e1885e1d2c3b376b3dccc8f373835f..7570278ab5c4520e77ac9405696660fba41e9250 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 60aad0168fbc0fdbfc11a5099c79042c10325d96..f294bdcb88d7a8f107b2a474745e7a5a8c280be2 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 fd8da1042d65e06496475d200a9ffae6b051cd83..639388fae7557d42708713edaf39f62278dd3de3 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 4cabdbc0c2b0fe0c9f67d97bb399bd05943806fb..db5cdc1fe6e7feb691f373c8a378cd69d1b6c5f2 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 befa0044652a36aa9ad767731d7f4f409bb852b4..3526f6171c9073b8f3cc7457ced921ca27fb1b9b 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
diff --git a/doc/sphinx/arm/hooks.rst b/doc/sphinx/arm/hooks.rst
index 573fe6a6fdee78881d48bd7b77614bd94297df40..8400b99194a8b729f48b3172f7ff20f5550a3a4a 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