From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 6 Aug 2019 15:04:04 +0000 (+0200)
Subject: [#777,!464] Reverted JSON files back to the original syntax.
X-Git-Tag: Kea-1.6.0~41^2~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5b68da569371f7bab1e3f8f74aa22e8fedd449e;p=thirdparty%2Fkea.git

[#777,!464] Reverted JSON files back to the original syntax.
---

diff --git a/doc/sphinx/api/build-report.json b/doc/sphinx/api/build-report.json
index 8a48890dc1..10b62fb610 100644
--- a/doc/sphinx/api/build-report.json
+++ b/doc/sphinx/api/build-report.json
@@ -3,8 +3,14 @@
     "brief": "Returns a list of compilation options that this particular binary was built with",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.2.0",
-    "resp-syntax": {
-        "result": 0,
-        "text": "<string with build details>"
-    }
+
+    "cmd-syntax": "{
+    \"command\": \"build-report\"
+}",
+
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": <string with build details>
+}",
+    "resp-comment": ""
 }
diff --git a/doc/sphinx/api/cache-get-by-id.json b/doc/sphinx/api/cache-get-by-id.json
index dbabce36ef..ec7fd55826 100644
--- a/doc/sphinx/api/cache-get-by-id.json
+++ b/doc/sphinx/api/cache-get-by-id.json
@@ -4,15 +4,14 @@
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.6.0",
     "hook": "host_cache",
-    "cmd-syntax": {
-        "command": "cache-get-by-id",
-        "arguments": {
-            "hw-address": "01:02:03:04:05:06"
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "2 entries returned.",
-        "arguments": "<list of host reservations>"
-    }
+    "cmd-syntax": "{
+    \"command\": \"cache-get-by-id\",
+    \"arguments\": {
+        \"hw-address\": \"01:02:03:04:05:06\"
+    }",
+    "resp-syntax": "{
+    \"result\": 0
+    \"text\": \"2 entries returned.\"
+    \"arguments\": <list of host reservations>
+}"
 }
diff --git a/doc/sphinx/api/cache-get.json b/doc/sphinx/api/cache-get.json
index 98458d09b1..7c72ff1b7f 100644
--- a/doc/sphinx/api/cache-get.json
+++ b/doc/sphinx/api/cache-get.json
@@ -5,9 +5,9 @@
     "avail": "1.4.0",
     "hook": "host_cache",
 
-    "resp-syntax": {
-        "result": 0,
-        "text": "123 entries returned.",
-        "arguments": "<list of host reservations>"
-    }
+    "resp-syntax": "{
+    \"result\": 0
+    \"text\": \"123 entries returned.\"
+    \"arguments\": <list of host reservations>
+}"
 }
diff --git a/doc/sphinx/api/cache-insert.json b/doc/sphinx/api/cache-insert.json
index d4fa0f9b10..e872c9ae04 100644
--- a/doc/sphinx/api/cache-insert.json
+++ b/doc/sphinx/api/cache-insert.json
@@ -5,40 +5,41 @@
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "host_cache",
-    "cmd-syntax": [{
-        "command": "cache-insert",
-        "arguments": {
-            "hw-address": "01:02:03:04:05:06",
-            "subnet-id4": 4,
-            "subnet-id6": 0,
-            "ip-address": "192.0.2.100",
-            "hostname": "somehost.example.org",
-            "client-classes4": [ ],
-            "client-classes6": [ ],
-            "option-data4": [ ],
-            "option-data6": [ ],
-            "next-server": "192.0.0.2",
-            "server-hostname": "server-hostname.example.org",
-            "boot-file-name": "bootfile.efi",
-            "host-id": 0
-        }
-    }, {
-        "command": "cache-insert",
-        "arguments": {
-            "hw-address": "01:02:03:04:05:06",
-            "subnet-id4": 0,
-            "subnet-id6": 6,
-            "ip-addresses": [ "2001:db8::cafe:babe" ],
-            "prefixes": [ "2001:db8:dead:beef::/64" ],
-            "hostname": "",
-            "client-classes4": [ ],
-            "client-classes6": [ ],
-            "option-data4": [ ],
-            "option-data6": [ ],
-            "next-server": "0.0.0.0",
-            "server-hostname": "",
-            "boot-file-name": "",
-            "host-id": 0
-        }
-    }]
+    "cmd-syntax": "{
+    \"command\": \"cache-insert\",
+    \"arguments\": {
+        \"hw-address\": \"01:02:03:04:05:06\",
+        \"subnet-id4\": 4,
+        \"subnet-id6\": 0,
+        \"ip-address\": \"192.0.2.100\",
+        \"hostname\": \"somehost.example.org\",
+        \"client-classes4\": [ ],
+        \"client-classes6\": [ ],
+        \"option-data4\": [ ],
+        \"option-data6\": [ ],
+        \"next-server\": \"192.0.0.2\",
+        \"server-hostname\": \"server-hostname.example.org\",
+        \"boot-file-name\": \"bootfile.efi\",
+        \"host-id\": 0
+    }
+},
+{
+    \"command\": \"cache-insert\",
+    \"arguments\": {
+        \"hw-address\": \"01:02:03:04:05:06\",
+        \"subnet-id4\": 0,
+        \"subnet-id6\": 6,
+        \"ip-addresses\": [ \"2001:db8::cafe:babe\" ],
+        \"prefixes\": [ \"2001:db8:dead:beef::/64\" ],
+        \"hostname\": \"\",
+        \"client-classes4\": [ ],
+        \"client-classes6\": [ ],
+        \"option-data4\": [ ],
+        \"option-data6\": [ ],
+        \"next-server\": \"0.0.0.0\",
+        \"server-hostname\": \"\",
+        \"boot-file-name\": \"\",
+        \"host-id\": 0
+    }
+}"
 }
diff --git a/doc/sphinx/api/cache-load.json b/doc/sphinx/api/cache-load.json
index c49c2bad42..582dc11b86 100644
--- a/doc/sphinx/api/cache-load.json
+++ b/doc/sphinx/api/cache-load.json
@@ -5,8 +5,8 @@
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "host_cache",
-    "cmd-syntax": {
-        "command": "cache-load",
-        "arguments": "/tmp/kea-host-cache.json"
-    }
+    "cmd-syntax": "{
+    \"command\": \"cache-load\",
+    \"arguments\": \"/tmp/kea-host-cache.json\"
+}"
 }
diff --git a/doc/sphinx/api/cache-remove.json b/doc/sphinx/api/cache-remove.json
index ac933b4fb3..564a28ec56 100644
--- a/doc/sphinx/api/cache-remove.json
+++ b/doc/sphinx/api/cache-remove.json
@@ -5,18 +5,20 @@
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "host_cache",
-    "cmd-syntax": [{
-        "command": "cache-remove",
-        "arguments": {
-            "ip-address": "192.0.2.1",
-            "subnet-id": 123
-        }
-    }, {
-        "command": "cache-remove",
-        "arguments": {
-            "duid": "00:01:ab:cd:f0:a1:c2:d3:e4",
-            "subnet-id": 123
-        },
-        "comment": "Another example that removes IPv6 host identifier by DUID and specific subnet-id is:"
-    }]
+    "cmd-syntax": "{
+    \"command\": \"cache-remove\",
+    \"arguments\": {
+        \"ip-address\": \"192.0.2.1\",
+        \"subnet-id\": 123
+    }
+}
+
+Another example that removes IPv6 host identifier by DUID and specific subnet-id is:
+{
+    \"command\": \"cache-remove\",
+    \"arguments\": {
+        \"duid\": \"00:01:ab:cd:f0:a1:c2:d3:e4\",
+        \"subnet-id\": 123
+    }
+}"
 }
diff --git a/doc/sphinx/api/cache-size.json b/doc/sphinx/api/cache-size.json
index d197c979a9..d30f9daa38 100644
--- a/doc/sphinx/api/cache-size.json
+++ b/doc/sphinx/api/cache-size.json
@@ -5,9 +5,9 @@
     "avail": "1.6.0",
     "hook": "host_cache",
 
-    "resp-syntax": {
-        "result": 0,
-        "text": "123 entries.",
-        "arguments": { "size": 123 }
-    }
+    "resp-syntax": "{
+    \"result\": 0
+    \"text\": \"123 entries.\"
+    \"arguments\": { \"size\": 123 }
+}"
 }
diff --git a/doc/sphinx/api/cache-write.json b/doc/sphinx/api/cache-write.json
index a223adafe7..635fe666e7 100644
--- a/doc/sphinx/api/cache-write.json
+++ b/doc/sphinx/api/cache-write.json
@@ -5,9 +5,9 @@
     "avail": "1.4.0",
     "hook": "host_cache",
 
-    "cmd-syntax": {
-        "command": "cache-write",
-        "arguments": "/path/to/the/file.json"
-    },
+    "cmd-syntax": "{
+    \"command\": \"cache-write\",
+    \"arguments\": \"/path/to/the/file.json\"
+}",
     "cmd-comment": "The command takes one mandatory argument that specifies a filename path of a file to be written."
 }
diff --git a/doc/sphinx/api/class-add.json b/doc/sphinx/api/class-add.json
index c9e19d3c0c..69e9a47900 100644
--- a/doc/sphinx/api/class-add.json
+++ b/doc/sphinx/api/class-add.json
@@ -1,28 +1,33 @@
 {
     "name": "class-add",
-    "brief": "This command is used to create and add a new class to the existing server configuration.",
+    "brief": "This command is used to create and add a new class to the existing
+              server configuration.",
     "description": "See <xref linkend=\"command-class-add\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.5.0",
     "hook": "class_cmds",
-    "cmd-syntax": {
-        "command": "class-add",
-        "arguments": {
-            "client-classes": [ {
-                "name": "<name of the class>",
-                "test": "<test expression to be evaluated on incoming packets>",
-                "option-data": [ "<option values here>" ],
-                "option-def": [ "<option defintions here>" ],
-                "next-server": "<ipv4 address>",
-                "server-hostname": "<string>",
-                "boot-file-name": "<name of the boot file>"
-            } ]
-        }
-    },
-    "cmd-comment": "The <command>next-server</command>, <command>server-hostname</command> and <command>boot-file-name</command> are DHCPv4 specific. Only one client class can be added with a single command. ",
-    "resp-syntax": {
-        "result": 0,
-        "text": "Class '<class-name>' added."
-    },
-    "resp-comment": "The command will be successful (result 0), unless the class name is a duplicate or another error occurs (result 1)."
+    "cmd-syntax": "{
+    \"command\": \"class-add\",
+    \"arguments\": {
+        \"client-classes\": [ {
+           \"name\": <name of the class>,
+           \"test\": <test expression to be evaluated on incoming packets>,
+           \"option-data\": [ <option values here> ],
+           \"option-def\": [ <option defintions here> ],
+           \"next-server\": <ipv4 address>,
+           \"server-hostname\": <string>,
+           \"boot-file-name\": <name of the boot file>
+        } ]
+    }
+}",
+    "cmd-comment": "The <command>next-server</command>,
+                    <command>server-hostname</command> and
+                    <command>boot-file-name</command> are DHCPv4 specific. Only
+                    one client class can be added with a single command. ",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Class '<class-name>' added.\",
+}",
+    "resp-comment": "The command will be successful (result 0), unless the
+                     class name is a duplicate or another error occurs (result 1)."
 }
diff --git a/doc/sphinx/api/class-del.json b/doc/sphinx/api/class-del.json
index ee444b5157..cd86213295 100644
--- a/doc/sphinx/api/class-del.json
+++ b/doc/sphinx/api/class-del.json
@@ -5,16 +5,19 @@
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.5.0",
     "hook": "class_cmds",
-    "cmd-syntax": {
-        "command": "class-del",
-        "arguments": {
-            "name": "<name of the class>"
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "Class '<class-name>' deleted."
-    },
-    "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."
+    "cmd-syntax": "{
+    \"command\": \"class-del\",
+    \"arguments\": {
+        \"name\": <name of the class>
+    }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Class '<class-name>' deleted.\"
+}",
+    "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."
 
 }
diff --git a/doc/sphinx/api/class-get.json b/doc/sphinx/api/class-get.json
index 7d637bdcb9..7330af0e2a 100644
--- a/doc/sphinx/api/class-get.json
+++ b/doc/sphinx/api/class-get.json
@@ -1,33 +1,40 @@
 {
     "name": "class-get",
-    "brief": "This command is used to return detailed information about an existing client class.",
+    "brief": "This command is used to return detailed information about an
+              existing client class.",
     "description": "See <xref linkend=\"command-class-get\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.5.0",
     "hook": "class_cmds",
-    "cmd-syntax": {
-        "command": "class-get",
-        "arguments": {
-            "name": "<name of the class>"
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "Class '<class-name>' definition returned",
-        "arguments": {
-            "client-classes": [
-                {
-                    "name": "<name of the class>",
-                    "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>" ],
-                    "next-server": "<ipv4 address>",
-                    "server-hostname": "<string>",
-                    "boot-file-name": "<name of the boot file>"
-                }
-            ]
-        }
-    },
-    "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."
+    "cmd-syntax": "{
+    \"command\": \"class-get\",
+    \"arguments\": {
+        \"name\": <name of the class>
+    }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Class '<class-name>' definition returned\",
+    \"arguments\": {
+        \"client-classes\": [
+            {
+                \"name\": <name of the class>,
+                \"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> ],
+                \"next-server\": <ipv4 address>,
+                \"server-hostname\": <string>,
+                \"boot-file-name\": <name of the boot file>
+            }
+        ]
+    }
+}",
+    "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."
 }
diff --git a/doc/sphinx/api/class-list.json b/doc/sphinx/api/class-list.json
index e8d08259fd..98c067fa3c 100644
--- a/doc/sphinx/api/class-list.json
+++ b/doc/sphinx/api/class-list.json
@@ -1,24 +1,35 @@
 {
     "name": "class-list",
-    "brief": "This command is used to retrieve a list of all client classes from the server configuration.",
+    "brief": "This command is used to retrieve a list of all client
+              classes from the server configuration.",
     "description": "See <xref linkend=\"command-class-list\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.5.0",
     "hook": "class_cmds",
+    "cmd-syntax": "{
+    \"command\": \"class-list\"
+}",
     "cmd-comment": "This command includes no arguments.",
-    "resp-syntax": {
-        "result": 0,
-        "text": "<number of> classes found",
-        "arguments": {
-            "client-classes": [
-                {
-                    "name": "<first class name>"
-                },
-                {
-                    "name": "<second class name>"
-                }
-            ]
-        }
-    },
-    "resp-comment": "The returned list of classes merely contains their names. In order to retrieve full information about one of these classes use <xref linkend=\"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. If there is an error while processing the command, the result of 1 is returned."
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"<number of> classes found\",
+    \"arguments\": {
+        \"client-classes\": [
+            {
+                \"name\": <first class name>
+            },
+            {
+                \"name\": <second class name>
+            }
+        ]
+    }
+}",
+    "resp-comment": "The returned list of classes merely contains their names.
+                     In order to retrieve full information about one of these
+                     classes use <xref linkend=\"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.
+                     If there is an error while processing the command, the
+                     result of 1 is returned."
 }
diff --git a/doc/sphinx/api/class-update.json b/doc/sphinx/api/class-update.json
index e300b32147..436da47c73 100644
--- a/doc/sphinx/api/class-update.json
+++ b/doc/sphinx/api/class-update.json
@@ -1,28 +1,35 @@
 {
     "name": "class-update",
-    "brief": "This command is used to update an existing client class in the server configuration.",
+    "brief": "This command is used to update an existing client class in
+              the server configuration.",
     "description": "See <xref linkend=\"command-class-update\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.5.0",
     "hook": "class_cmds",
-    "cmd-syntax": {
-        "command": "class-update",
-        "arguments": {
-            "client-classes": [ {
-                "name": "<name of the class>",
-                "test": "<test expression to be evaluated on incoming packets>",
-           "option-data": [ "<option values here>" ],
-           "option-def": [ "<option defintions here>" ],
-           "next-server": "<ipv4 address>",
-           "server-hostname": "<string>",
-           "boot-file-name": "<name of the boot file>"
-            } ]
-        }
-    },
-    "cmd-comment": "The <command>next-server</command>, <command>server-hostname</command> and <command>boot-file-name</command> are DHCPv4 specific. Only one client class can be updated with a single command. ",
-    "resp-syntax": {
-        "result": 0,
-        "text": "Class '<class-name>' updated."
-    },
-    "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."
+    "cmd-syntax": "{
+    \"command\": \"class-update\",
+    \"arguments\": {
+        \"client-classes\": [ {
+           \"name\": <name of the class>,
+           \"test\": <test expression to be evaluated on incoming packets>,
+           \"option-data\": [ <option values here> ],
+           \"option-def\": [ <option defintions here> ],
+           \"next-server\": <ipv4 address>,
+           \"server-hostname\": <string>,
+           \"boot-file-name\": <name of the boot file>
+        } ]
+    }
+}",
+    "cmd-comment": "The <command>next-server</command>,
+                    <command>server-hostname</command> and
+                    <command>boot-file-name</command> are DHCPv4 specific. Only
+                    one client class can be updated with a single command. ",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Class '<class-name>' updated.\",
+}",
+    "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."
 }
diff --git a/doc/sphinx/api/config-get.json b/doc/sphinx/api/config-get.json
index 856b1f6b5a..70109bb16f 100644
--- a/doc/sphinx/api/config-get.json
+++ b/doc/sphinx/api/config-get.json
@@ -1,12 +1,20 @@
 {
     "name": "config-get",
-    "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.",
+    "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.",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.2.0",
+
+    "cmd-syntax": "{
+    \"command\": \"config-get\"
+}",
     "cmd-comment": "This command takes no parameters.",
 
-    "resp-syntax": {
-        "result": "<integer>",
-        "arguments": "<JSON configuration here, starting with Dhcp4, Dhcp6, or Control-agent object>"
+    "resp-syntax": "{
+    \"result\": <integer>,
+    \"arguments\": {
+        <JSON configuration here, starting with Dhcp4, Dhcp6, or Control-agent object>
     }
+}"
 }
diff --git a/doc/sphinx/api/config-reload.json b/doc/sphinx/api/config-reload.json
index 1f3f38d87f..400559b5a8 100644
--- a/doc/sphinx/api/config-reload.json
+++ b/doc/sphinx/api/config-reload.json
@@ -3,5 +3,8 @@
     "brief": "The config-reload command instructs Kea to load again the configuration file that was used previously.",
     "description": "See <xref linkend=\"command-config-reload\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
-    "avail": "1.2.0"
+    "avail": "1.2.0",
+    "cmd-syntax": "{
+    \"command\": \"config-reload\"
+}"
 }
diff --git a/doc/sphinx/api/config-set.json b/doc/sphinx/api/config-set.json
index a2058aab69..ce0cb4b9ee 100644
--- a/doc/sphinx/api/config-set.json
+++ b/doc/sphinx/api/config-set.json
@@ -4,17 +4,17 @@
     "description": "See <xref linkend=\"command-config-set\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.2.0",
-    "cmd-syntax": {
-        "command": "config-set",
-        "arguments":  {
-            "<server>": {
-            }
+    "cmd-syntax": "{
+    \"command\": \"config-set\",
+    \"arguments\":  {
+        \"<server>\": {
         }
-    },
-    "cmd-comment": "where <server> is the configuration element name for a given server such as 'Dhcp4' or 'Dhcp6'",
-    "resp-syntax": [{
-        "result": 0, "text": "Configuration successful."
-    },  {
-        "result": 1, "text": "unsupported parameter: BOGUS (<string>:16:26)"
-    }]
+     }
+}",
+    "cmd-comment": "where &lt;server&gt; is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"",
+    "resp-syntax": "    {\"result\": 0, \"text\": \"Configuration successful.\" }
+
+    or
+
+    {\"result\": 1, \"text\": \"unsupported parameter: BOGUS (<string>:16:26)\" }"
 }
diff --git a/doc/sphinx/api/config-test.json b/doc/sphinx/api/config-test.json
index 6482de958b..ea9f12f267 100644
--- a/doc/sphinx/api/config-test.json
+++ b/doc/sphinx/api/config-test.json
@@ -4,17 +4,17 @@
     "description": "See <xref linkend=\"command-config-test\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.2.0",
-    "cmd-syntax": {
-        "command": "config-test",
-        "arguments":  {
-            "<server>": {
-            }
+    "cmd-syntax": "{
+    \"command\": \"config-test\",
+    \"arguments\":  {
+        \"<server>\": {
         }
-    },
-    "cmd-comment": "where <server> is the configuration element name for a given server such as 'Dhcp4' or 'Dhcp6'",
-    "resp-syntax": [{
-        "result": 0, "text": "Configuration seems sane..."
-    }, {
-        "result": 1, "text": "unsupported parameter: BOGUS (<string>:16:26)"
-    }]
+     }
+}",
+    "cmd-comment": "where &gt;server&lt; is the configuration element name for a given server such as \"Dhcp4\" or \"Dhcp6\"",
+    "resp-syntax": "{\"result\": 0, \"text\": \"Configuration seems sane...\" }
+
+    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 2d08f74fda..098f7e1c71 100644
--- a/doc/sphinx/api/config-write.json
+++ b/doc/sphinx/api/config-write.json
@@ -1,13 +1,14 @@
 {
     "name": "config-write",
-    "brief": "The config-write command instructs the Kea server to write its current configuration to a file on disk.",
+    "brief": "The config-write command instructs the Kea server to write its
+              current configuration to a file on disk.",
     "description": "See <xref linkend=\"command-config-write\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.2.0",
-    "cmd-syntax": {
-        "command": "config-write",
-        "arguments": {
-            "filename": "config-modified-2017-03-15.json"
-        }
+    "cmd-syntax": "{
+    \"command\": \"config-write\",
+    \"arguments\": {
+        \"filename\": \"config-modified-2017-03-15.json\"
     }
+}"
 }
diff --git a/doc/sphinx/api/dhcp-disable.json b/doc/sphinx/api/dhcp-disable.json
index 15a219d779..80baa6b2b9 100644
--- a/doc/sphinx/api/dhcp-disable.json
+++ b/doc/sphinx/api/dhcp-disable.json
@@ -4,10 +4,10 @@
     "description": "See <xref linkend=\"command-dhcp-disable\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
-    "cmd-syntax": {
-        "command": "dhcp-disable",
-        "arguments": {
-            "max-period": 20
-        }
+    "cmd-syntax": "{
+    \"command\": \"dhcp-disable\",
+    \"arguments\": {
+        \"max-period\": 20
     }
+}"
 }
diff --git a/doc/sphinx/api/dhcp-enable.json b/doc/sphinx/api/dhcp-enable.json
index bb956ec12f..a945b931f4 100644
--- a/doc/sphinx/api/dhcp-enable.json
+++ b/doc/sphinx/api/dhcp-enable.json
@@ -3,5 +3,8 @@
     "brief": "The dhcp-enable command globally enables the DHCP service.",
     "description": "See <xref linkend=\"command-dhcp-enable\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
-    "avail": "1.4.0"
+    "avail": "1.4.0",
+    "cmd-syntax": "{
+    \"command\": \"dhcp-enable\"
+}"
 }
diff --git a/doc/sphinx/api/ha-heartbeat.json b/doc/sphinx/api/ha-heartbeat.json
index b5cfde2268..0ed6464e19 100644
--- a/doc/sphinx/api/ha-heartbeat.json
+++ b/doc/sphinx/api/ha-heartbeat.json
@@ -1,9 +1,13 @@
 {
     "name": "ha-heartbeat",
-    "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.",
+    "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.",
     "description": "See <xref linkend=\"ha-server-states\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "high_availability",
+    "cmd-syntax": "{
+    \"command\": \"ha-heartbeat\",
+    }",
     "resp-comment": "The response to this command is different from the typical command response. The response will include server state (see <xref linkend=\"ha-server-states\"/> plus the current clock value."
 }
diff --git a/doc/sphinx/api/ha-scopes.json b/doc/sphinx/api/ha-scopes.json
index 499c96c23b..28b48eeb92 100644
--- a/doc/sphinx/api/ha-scopes.json
+++ b/doc/sphinx/api/ha-scopes.json
@@ -5,12 +5,11 @@
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "high_availability",
-    "cmd-syntax": {
-        "command": "ha-scopes",
-        "service": [ "<service, typically 'dhcp4' or 'dhcp6'>" ],
-        "arguments": {
-            "scopes": [ "HA_server1", "HA_server2" ]
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"ha-scopes\",
+    \"service\": [ <service, typically \"dhcp4\" or \"dhcp6\"> ],
+    \"arguments\": {
+        \"scopes\": [ \"HA_server1\", \"HA_server2\" ]
+    }",
     "cmd-comment": "In the example given, the arguments configure the server to handle traffic from both HA_server1 and HA_server2 scopes."
 }
diff --git a/doc/sphinx/api/ha-sync.json b/doc/sphinx/api/ha-sync.json
index 74872e0852..282ca606d8 100644
--- a/doc/sphinx/api/ha-sync.json
+++ b/doc/sphinx/api/ha-sync.json
@@ -1,16 +1,17 @@
 {
     "name": "ha-sync",
-    "brief": "The command is issued to instruct the server running in HA mode to synchronize its local lease database with the selected peer.",
+    "brief": "The command is issued to instruct the server running in HA mode to 
+              synchronize its local lease database with the selected peer.",
     "description": "See <xref linkend=\"command-ha-sync\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "high_availability",
-    "cmd-syntax": {
-        "command": "ha-sync",
-        "service": [ "<service affected: 'dhcp4' or 'dhcp6'" ],
-        "arguments": {
-            "server-name": "<name of the partner server>",
-        "max-period": "<integer, in seconds>"
-        }
+    "cmd-syntax": "{
+    \"command\": \"ha-sync\",
+    \"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 b099613fbc..7e95990ce1 100644
--- a/doc/sphinx/api/lease4-add.json
+++ b/doc/sphinx/api/lease4-add.json
@@ -5,12 +5,12 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease4-add",
-        "arguments": {
-            "ip-address": "192.0.2.202",
-            "hw-address": "1a:1b:1c:1d:1e:1f"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"lease4-add\",
+    \"arguments\": {
+        \"ip-address\": \"192.0.2.202\",
+        \"hw-address\": \"1a:1b:1c:1d:1e:1f\"
+    }
+}",
     "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."
 }
diff --git a/doc/sphinx/api/lease4-del.json b/doc/sphinx/api/lease4-del.json
index bf5052bf2c..37ccc6bb9a 100644
--- a/doc/sphinx/api/lease4-del.json
+++ b/doc/sphinx/api/lease4-del.json
@@ -5,11 +5,11 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease4-del",
-        "arguments": {
-            "ip-address": "192.0.2.202"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"lease4-del\",
+    \"arguments\": {
+        \"ip-address\": \"192.0.2.202\"
+    }
+}",
     "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\"."
-}
+}
\ 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 e36cf358ed..1b03e3abfe 100644
--- a/doc/sphinx/api/lease4-get-all.json
+++ b/doc/sphinx/api/lease4-get-all.json
@@ -5,9 +5,9 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.4.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease4-get-all",
-        "arguments": "subnets"
-    },
+    "cmd-syntax": "{
+    \"command\": \"lease4-get-all\"
+    \"arguments\": \"subnets\"
+}",
     "cmd-comment": "The lease4-get-all command may result in very large responses."
 }
diff --git a/doc/sphinx/api/lease4-get.json b/doc/sphinx/api/lease4-get.json
index 0558036656..2fea7c8b49 100644
--- a/doc/sphinx/api/lease4-get.json
+++ b/doc/sphinx/api/lease4-get.json
@@ -5,27 +5,27 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease4-get",
-        "arguments": {
-            "ip-address": "192.0.2.1"
-        }
-    },
-    "resp-syntax": {
-        "arguments": {
-            "client-id": "42:42:42:42:42:42:42:42",
-            "cltt": 12345678,
-            "fqdn-fwd": false,
-            "fqdn-rev": true,
-            "hostname": "myhost.example.com.",
-            "hw-address": "08:08:08:08:08:08",
-            "ip-address": "192.0.2.1",
-            "state": 0,
-            "subnet-id": 44,
-            "valid-lft": 3600
-        },
-        "result": 0,
-        "text": "IPv4 lease found."
-    },
+    "cmd-syntax": "{
+    \"command\": \"lease4-get\",
+    \"arguments\": {
+        \"ip-address\": \"192.0.2.1\"
+    }
+}",
+    "resp-syntax": "{
+  \"arguments\": {
+    \"client-id\": \"42:42:42:42:42:42:42:42\",
+    \"cltt\": 12345678,
+    \"fqdn-fwd\": false,
+    \"fqdn-rev\": true,
+    \"hostname\": \"myhost.example.com.\",
+    \"hw-address\": \"08:08:08:08:08:08\",
+    \"ip-address\": \"192.0.2.1\",
+    \"state\": 0,
+    \"subnet-id\": 44,
+    \"valid-lft\": 3600
+  },
+  \"result\": 0,
+  \"text\": \"IPv4 lease found.\"
+}",
     "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)."
 }
diff --git a/doc/sphinx/api/lease4-update.json b/doc/sphinx/api/lease4-update.json
index 379ebbd449..8ae92c2386 100644
--- a/doc/sphinx/api/lease4-update.json
+++ b/doc/sphinx/api/lease4-update.json
@@ -5,14 +5,14 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease4-update",
-        "arguments": {
-            "ip-address": "192.0.2.1",
-            "hostname": "newhostname.example.org",
-            "hw-address": "1a:1b:1c:1d:1e:1f",
-            "subnet-id": 44,
-            "force-create": true
-        }
-    }
+    "cmd-syntax": "{
+  \"command\": \"lease4-update\",
+  \"arguments\": {
+    \"ip-address\": \"192.0.2.1\",
+    \"hostname\": \"newhostname.example.org\",
+    \"hw-address\": \"1a:1b:1c:1d:1e:1f\",
+    \"subnet-id\": 44,
+    \"force-create\": true
+  }
+}"
 }
diff --git a/doc/sphinx/api/lease4-wipe.json b/doc/sphinx/api/lease4-wipe.json
index 101b0ae3af..1b6d745dcb 100644
--- a/doc/sphinx/api/lease4-wipe.json
+++ b/doc/sphinx/api/lease4-wipe.json
@@ -5,10 +5,10 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease4-wipe",
-        "arguments": {
-            "subnet-id": 44
-        }
-    }
+    "cmd-syntax": "{
+  \"command\": \"lease4-wipe\",
+  \"arguments\": {
+    \"subnet-id\": 44
+  }
+}"
 }
diff --git a/doc/sphinx/api/lease6-add.json b/doc/sphinx/api/lease6-add.json
index 78d050214e..039b11203a 100644
--- a/doc/sphinx/api/lease6-add.json
+++ b/doc/sphinx/api/lease6-add.json
@@ -5,19 +5,16 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-add",
-        "arguments": {
-            "subnet-id": 66,
-            "ip-address": "2001:db8::3",
-            "duid": "1a:1b:1c:1d:1e:1f:20:21:22:23:24",
-            "iaid": 1234
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"lease6-add\",
+    \"arguments\": {
+        \"subnet-id\": 66,
+        \"ip-address\": \"2001:db8::3\",
+        \"duid\": \"1a:1b:1c:1d:1e:1f:20:21:22:23:24\",
+        \"iaid\": 1234
+    }
+}",
     "cmd-comment": "lease6-add can be also used to add leases for IPv6 prefixes..",
-    "resp-syntax": [{
-        "result": 0, "text": "Lease added."
-    }, {
-        "result": 1, "text": "missing parameter 'ip-address' (<string>:3:19)"
-    }]
+    "resp-syntax": "{ \"result\": 0, \"text\": \"Lease added.\" }
+    { \"result\": 1, \"text\": \"missing parameter 'ip-address' (<string>:3:19)\" }"
 }
diff --git a/doc/sphinx/api/lease6-bulk-apply.json b/doc/sphinx/api/lease6-bulk-apply.json
index 05cf30ae94..d132b9758f 100644
--- a/doc/sphinx/api/lease6-bulk-apply.json
+++ b/doc/sphinx/api/lease6-bulk-apply.json
@@ -4,55 +4,61 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.6.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-bulk-apply",
-        "arguments": {
-            "deleted-leases": [
+    "cmd-syntax": "{
+        \"command\": \"lease6-bulk-apply\",
+        \"arguments\": {
+            \"deleted-leases\": [
                 {
-                    "ip-address": "2001:db8:abcd::",
-                    "type": "IA_PD"
+                    \"ip-address\": \"2001:db8:abcd::\",
+                    \"type\": \"IA_PD\",
+                    ...
                 },
                 {
-                    "ip-address": "2001:db8:abcd::234",
-                    "type": "IA_NA"
+                    \"ip-address\": \"2001:db8:abcd::234\",
+                    \"type\": \"IA_NA\",
+                    ...
                 }
             ],
-            "leases": [
+            \"leases\": [
                 {
-                    "subnet-id": 66,
-                    "ip-address": "2001:db8:cafe::",
-                    "type": "IA_PD"
+                    \"subnet-id\": 66,
+                    \"ip-address\": \"2001:db8:cafe::\",
+                    \"type\": \"IA_PD\",
+                    ...
                 },
                 {
-                    "subnet-id": 66,
-                    "ip-address": "2001:db8:abcd::333",
-                    "type": "IA_NA"
+                    \"subnet-id\": 66,
+                    \"ip-address\": \"2001:db8:abcd::333\",
+                    \"type\": \"IA_NA\",
+                    ...
                 }
             ]
         }
-    },
-    "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.",
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv6 leases bulk apply completed.",
-        "arguments": {
-            "failed-deleted-leases": [
+}",
+    "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.",
+    "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>"
+                    \"ip-address\": \"2001:db8:abcd::\",
+                    \"type\": \"IA_PD\",
+                    \"result\": <control result>,
+                    \"error-message\": <error message>
                 }
             ],
-            "failed-leases": [
+            \"failed-leases\": [
                 {
-                    "ip-address": "2001:db8:cafe::",
-                    "type": "IA_PD",
-                    "result": "<control result>",
-                    "error-message": "<error message>"
+                    \"ip-address\": \"2001:db8:cafe::\",
+                    \"type\": \"IA_PD\",
+                    \"result\" <control result>,
+                    \"error-message\": <error message>
                 }
             ]
         }
-    },
-    "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."
+    }
+}",
+    "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."
 }
diff --git a/doc/sphinx/api/lease6-del.json b/doc/sphinx/api/lease6-del.json
index 2330b9cbe2..c81bb27b83 100644
--- a/doc/sphinx/api/lease6-del.json
+++ b/doc/sphinx/api/lease6-del.json
@@ -5,11 +5,11 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-del",
-        "arguments": {
-            "ip-address": "192.0.2.202"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"lease6-del\",
+    \"arguments\": {
+        \"ip-address\": \"192.0.2.202\"
+    }
+}",
     "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)."
 }
diff --git a/doc/sphinx/api/lease6-get-all.json b/doc/sphinx/api/lease6-get-all.json
index 1f02eb5dfb..e60bc812b9 100644
--- a/doc/sphinx/api/lease6-get-all.json
+++ b/doc/sphinx/api/lease6-get-all.json
@@ -5,49 +5,49 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-get-all",
-        "arguments": {
-            "subnets": [ 1, 2, 3, 4 ]
-        }
-    },
-    "resp-syntax": {
-        "arguments": {
-            "leases": [
-                {
-                    "cltt": 12345678,
-                    "duid": "42:42:42:42:42:42:42:42",
-                    "fqdn-fwd": false,
-                    "fqdn-rev": true,
-                    "hostname": "myhost.example.com.",
-                    "hw-address": "08:08:08:08:08:08",
-                    "iaid": 1,
-                    "ip-address": "2001:db8:2::1",
-                    "preferred-lft": 500,
-                    "state": 0,
-                    "subnet-id": 44,
-                    "type": "IA_NA",
-                    "valid-lft": 3600
-                },
-                {
-                    "cltt": 12345678,
-                    "duid": "21:21:21:21:21:21:21:21",
-                    "fqdn-fwd": false,
-                    "fqdn-rev": true,
-                    "hostname": "",
-                    "iaid": 1,
-                    "ip-address": "2001:db8:0:0:2::",
-                    "preferred-lft": 500,
-                    "prefix-len": 80,
-                    "state": 0,
-                    "subnet-id": 44,
-                    "type": "IA_PD",
-                    "valid-lft": 3600
-                }
-            ]
-        },
-        "result": 0,
-        "text": "2 IPv6 lease(s) found."
+    "cmd-syntax": "{
+    \"command\": \"lease6-get-all\",
+    \"arguments\": {
+        \"subnets\": [ 1, 2, 3, 4 ]
+    }
+}",
+    "resp-syntax": "{
+    \"arguments\": {
+        \"leases\": [
+            {
+                \"cltt\": 12345678,
+                \"duid\": \"42:42:42:42:42:42:42:42\",
+                \"fqdn-fwd\": false,
+                \"fqdn-rev\": true,
+                \"hostname\": \"myhost.example.com.\",
+                \"hw-address\": \"08:08:08:08:08:08\",
+                \"iaid\": 1,
+                \"ip-address\": \"2001:db8:2::1\",
+                \"preferred-lft\": 500,
+                \"state\": 0,
+                \"subnet-id\": 44,
+                \"type\": \"IA_NA\",
+                \"valid-lft\": 3600
+            },
+            {
+                \"cltt\": 12345678,
+                \"duid\": \"21:21:21:21:21:21:21:21\",
+                \"fqdn-fwd\": false,
+                \"fqdn-rev\": true,
+                \"hostname\": \"\",
+                \"iaid\": 1,
+                \"ip-address\": \"2001:db8:0:0:2::\",
+                \"preferred-lft\": 500,
+                \"prefix-len\": 80,
+                \"state\": 0,
+                \"subnet-id\": 44,
+                \"type\": \"IA_PD\",
+                \"valid-lft\": 3600
+            }
+        ]
     },
+    \"result\": 0,
+    \"text\": \"2 IPv6 lease(s) found.\"
+}",
     "resp-comment": "The lease6-get-all command may result in very large responses."
-}
+}
\ No newline at end of file
diff --git a/doc/sphinx/api/lease6-get.json b/doc/sphinx/api/lease6-get.json
index 91f628c990..646c7eafbc 100644
--- a/doc/sphinx/api/lease6-get.json
+++ b/doc/sphinx/api/lease6-get.json
@@ -5,12 +5,12 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-get",
-        "arguments": {
-            "ip-address": "2001:db8:1234:ab::",
-            "type": "IA_PD"
-        }
-    },
+    "cmd-syntax": "{
+  \"command\": \"lease6-get\",
+  \"arguments\": {
+    \"ip-address\": \"2001:db8:1234:ab::\",
+    \"type\": \"IA_PD\"
+  }
+}",
     "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)."
-}
+}
\ No newline at end of file
diff --git a/doc/sphinx/api/lease6-update.json b/doc/sphinx/api/lease6-update.json
index 4ec68aa3eb..26a7bb694d 100644
--- a/doc/sphinx/api/lease6-update.json
+++ b/doc/sphinx/api/lease6-update.json
@@ -5,15 +5,16 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-update",
-        "arguments": {
-            "ip-address": "2001:db8::1",
-            "duid": "88:88:88:88:88:88:88:88",
-            "iaid": 7654321,
-            "hostname": "newhostname.example.org",
-            "subnet-id": 66,
-            "force-create": false
-        }
-    }
+    "cmd-syntax": "{
+  \"command\": \"lease6-update\",
+  \"arguments\": {
+    \"ip-address\": \"2001:db8::1\",
+    \"duid\": \"88:88:88:88:88:88:88:88\",
+    \"iaid\": 7654321,
+    \"hostname\": \"newhostname.example.org\",
+    \"subnet-id\": 66,
+    \"force-create\": false
+  }
+}
+"
 }
diff --git a/doc/sphinx/api/lease6-wipe.json b/doc/sphinx/api/lease6-wipe.json
index 23c5dac648..ace82847b7 100644
--- a/doc/sphinx/api/lease6-wipe.json
+++ b/doc/sphinx/api/lease6-wipe.json
@@ -5,11 +5,11 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "lease_cmds",
-    "cmd-syntax": {
-        "command": "lease6-wipe",
-        "arguments": {
-            "subnet-id": 66
-        }
-    },
+    "cmd-syntax": "{
+  \"command\": \"lease6-wipe\",
+  \"arguments\": {
+    \"subnet-id\": 66
+  }
+}",
     "cmd-comment": "Note: not all backends support this command."
 }
diff --git a/doc/sphinx/api/leases-reclaim.json b/doc/sphinx/api/leases-reclaim.json
index 6354aab41b..c6d9b8f2bc 100644
--- a/doc/sphinx/api/leases-reclaim.json
+++ b/doc/sphinx/api/leases-reclaim.json
@@ -4,10 +4,10 @@
     "description": "See <xref linkend=\"command-leases-reclaim\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "leases-reclaim",
-        "arguments": {
-            "remove": true
-        }
+    "cmd-syntax": "{
+    \"command\": \"leases-reclaim\",
+    \"arguments\": {
+        \"remove\": true
     }
+}"
 }
diff --git a/doc/sphinx/api/libreload.json b/doc/sphinx/api/libreload.json
index 66535c3727..3b881a990a 100644
--- a/doc/sphinx/api/libreload.json
+++ b/doc/sphinx/api/libreload.json
@@ -4,9 +4,9 @@
     "description": "See <xref linkend=\"command-libreload\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.2.0",
-    "cmd-syntax": {
-        "command": "libreload",
-        "arguments": { }
-    },
+    "cmd-syntax": "{
+    \"command\": \"libreload\",
+    \"arguments\": { }
+}",
     "cmd-comment": "The server will respond with a result of 0 indicating success, or 1 indicating a failure."
 }
diff --git a/doc/sphinx/api/list-commands.json b/doc/sphinx/api/list-commands.json
index a0fae1e17d..f0318c6f9d 100644
--- a/doc/sphinx/api/list-commands.json
+++ b/doc/sphinx/api/list-commands.json
@@ -4,9 +4,9 @@
     "description": "See <xref linkend=\"command-list-commands\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "list-commands",
-        "arguments": { }
-    },
+    "cmd-syntax": "{
+    \"command\": \"list-commands\",
+    \"arguments\": { }
+}",
     "cmd-comment": "The server will respond with a list of all supported commands."
 }
diff --git a/doc/sphinx/api/network4-add.json b/doc/sphinx/api/network4-add.json
index c12cf96ca0..c6fc25b814 100644
--- a/doc/sphinx/api/network4-add.json
+++ b/doc/sphinx/api/network4-add.json
@@ -5,42 +5,42 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-add",
-        "arguments": {
-            "shared-networks": [ {
-                "name": "floor13",
-                "subnet4": [
+    "cmd-syntax": "{
+    \"command\": \"network4-add\",
+    \"arguments\": {
+        \"shared-networks\": [ {
+            \"name\": \"floor13\",
+            \"subnet4\": [
+            {
+                \"id\": 100,
+                \"pools\": [ { \"pool\": \"192.0.2.2-192.0.2.99\" } ],
+                \"subnet\": \"192.0.2.0/24\",
+                \"option-data\": [
                     {
-                        "id": 100,
-                        "pools": [ { "pool": "192.0.2.2-192.0.2.99" } ],
-                        "subnet": "192.0.2.0/24",
-                        "option-data": [
-                            {
-                                "name": "routers",
-                                "data": "192.0.2.1"
-                            }
-                        ]
-                    },
+                        \"name\": \"routers\",
+                        \"data\": \"192.0.2.1\"
+                    }
+                ]
+            },
+            {
+                \"id\": 101,
+                \"pools\": [ { \"pool\": \"192.0.3.2-192.0.3.99\" } ],
+                \"subnet\": \"192.0.3.0/24\",
+                \"option-data\": [
                     {
-                        "id": 101,
-                        "pools": [ { "pool": "192.0.3.2-192.0.3.99" } ],
-                        "subnet": "192.0.3.0/24",
-                        "option-data": [
-                            {
-                                "name": "routers",
-                                "data": "192.0.3.1"
-                            }
-                        ]
-                    } ]
+                        \"name\": \"routers\",
+                        \"data\": \"192.0.3.1\"
+                    }
+                ]
             } ]
-        }
-    },
-    "resp-syntax": {
-        "arguments": {
-            "shared-networks": [ { "name": "floor13" } ]
-        },
-        "result": 0,
-        "text": "A new IPv4 shared network 'floor13' added"
+        } ]
     }
+}",
+    "resp-syntax": "{
+    \"arguments\": {
+        \"shared-networks\": [ { \"name\": \"floor13\" } ]
+    },
+    \"result\": 0,
+    \"text\": \"A new IPv4 shared network 'floor13' added\"
+}"
 }
diff --git a/doc/sphinx/api/network4-del.json b/doc/sphinx/api/network4-del.json
index b9b389aa3d..df747a05da 100644
--- a/doc/sphinx/api/network4-del.json
+++ b/doc/sphinx/api/network4-del.json
@@ -5,21 +5,21 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-del",
-        "arguments": {
-            "name": "floor13"
-        }
-    },
-    "resp-syntax": {
-        "arguments": {
-            "shared-networks": [
-                {
-                    "name": "floor13"
-                }
-            ]
-        },
-        "result": 0,
-        "text": "IPv4 shared network 'floor13' deleted"
+    "cmd-syntax": "{
+    \"command\": \"network4-del\",
+    \"arguments\": {
+        \"name\": \"floor13\"
     }
+}",
+    "resp-syntax": "{
+    \"arguments\": {
+        \"shared-networks\": [
+            {
+                \"name\": \"floor13\"
+            }
+        ]
+    },
+    \"result\": 0,
+    \"text\": \"IPv4 shared network 'floor13' deleted\"
+}"
 }
diff --git a/doc/sphinx/api/network4-get.json b/doc/sphinx/api/network4-get.json
index ba25c8ae93..83c91dd058 100644
--- a/doc/sphinx/api/network4-get.json
+++ b/doc/sphinx/api/network4-get.json
@@ -5,41 +5,43 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-get",
-        "arguments": {
-            "name": "floor13"
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "Info about IPv4 shared network 'floor13' returned",
-        "arguments": {
-            "shared-networks": [
+    "cmd-syntax": "{
+    \"command\": \"network4-get\",
+    \"arguments\": {
+        \"name\": \"floor13\"
+    }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Info about IPv4 shared network 'floor13' returned\",
+    \"arguments\": {
+        \"shared-networks\": [
+        {
+            \"match-client-id\": true,
+            \"name\": \"floor13\",
+            \"option-data\": [ ],
+            \"rebind-timer\": 90,
+            \"relay\": {
+                \"ip-address\": \"0.0.0.0\"
+            },
+            \"renew-timer\": 60,
+            \"reservation-mode\": \"all\",
+            \"subnet4\": [
+                {
+                    \"subnet\": \"192.0.2.0/24\",
+                    \"id\": 5,
+                    // many other subnet specific details here
+                },
                 {
-                    "match-client-id": true,
-                    "name": "floor13",
-                    "option-data": [ ],
-                    "rebind-timer": 90,
-                    "relay": {
-                        "ip-address": "0.0.0.0"
-                    },
-                    "renew-timer": 60,
-                    "reservation-mode": "all",
-                    "subnet4": [
-                        {
-                            "subnet": "192.0.2.0/24",
-                            "id": 5
-                        },
-                        {
-                            "id": 6,
-                            "subnet": "192.0.3.0/31"
-                        }
-                    ],
-                    "valid-lifetime": 120
+                    \"id\": 6,
+                    \"subnet\": \"192.0.3.0/31\",
+                    // many other subnet specific details here
                 }
-            ]
+            ],
+            \"valid-lifetime\": 120
         }
-    },
+        ]
+    }
+}",
     "resp-comment": "Note that the actual response contains many additional fields that are omitted here for clarity."
 }
diff --git a/doc/sphinx/api/network4-list.json b/doc/sphinx/api/network4-list.json
index eed2fe8a91..77e8da9412 100644
--- a/doc/sphinx/api/network4-list.json
+++ b/doc/sphinx/api/network4-list.json
@@ -5,14 +5,17 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "resp-syntax": {
-        "arguments": {
-            "shared-networks": [
-                { "name": "floor1" },
-                { "name": "office" }
-            ]
-        },
-        "result": 0,
-        "text": "2 IPv4 network(s) found"
-    }
+    "cmd-syntax": "{
+    \"command\": \"network4-list\"
+}",
+    "resp-syntax": "{
+    \"arguments\": {
+        \"shared-networks\": [
+            { \"name\": \"floor1\" },
+            { \"name\": \"office\" }
+        ]
+    },
+    \"result\": 0,
+    \"text\": \"2 IPv4 network(s) found\"
+}"
 }
diff --git a/doc/sphinx/api/network4-subnet-add.json b/doc/sphinx/api/network4-subnet-add.json
index c16c2b5c0f..f1e3265167 100644
--- a/doc/sphinx/api/network4-subnet-add.json
+++ b/doc/sphinx/api/network4-subnet-add.json
@@ -5,15 +5,15 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-subnet-add",
-        "arguments": {
-            "name": "floor13",
-            "id": 5
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network 'floor1'"
+    "cmd-syntax": "{
+    \"command\": \"network4-subnet-add\",
+    \"arguments\": {
+        \"name\": \"floor13\",
+        \"id\": 5
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network 'floor1'\"
+}"
 }
diff --git a/doc/sphinx/api/network4-subnet-del.json b/doc/sphinx/api/network4-subnet-del.json
index 5c454aae8b..d417f4f663 100644
--- a/doc/sphinx/api/network4-subnet-del.json
+++ b/doc/sphinx/api/network4-subnet-del.json
@@ -5,15 +5,15 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-subnet-del",
-        "arguments": {
-            "name": "floor13",
-            "id": 5
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network 'floor13'"
+    "cmd-syntax": "{
+    \"command\": \"network4-subnet-del\",
+    \"arguments\": {
+        \"name\": \"floor13\",
+        \"id\": 5
     }
+ }",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network 'floor13'\"
+}"
 }
diff --git a/doc/sphinx/api/network6-add.json b/doc/sphinx/api/network6-add.json
index 96c5742100..b3ddab8e90 100644
--- a/doc/sphinx/api/network6-add.json
+++ b/doc/sphinx/api/network6-add.json
@@ -1,47 +1,47 @@
 {
-    "name": "network6-add",
+     "name": "network6-add",
     "brief": "The network6-add command is used to add a new shared network.",
     "description": "See <xref linkend=\"idp75\"/>",
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-add",
-        "arguments": {
-            "shared-networks": [ {
-                "name": "floor13",
-                "subnet4": [
+    "cmd-syntax": "{
+    \"command\": \"network4-add\",
+    \"arguments\": {
+        \"shared-networks\": [ {
+            \"name\": \"floor13\",
+            \"subnet4\": [
+            {
+                \"id\": 100,
+                \"pools\": [ { \"pool\": \"192.0.2.2-192.0.2.99\" } ],
+                \"subnet\": \"192.0.2.0/24\",
+                \"option-data\": [
                     {
-                        "id": 100,
-                        "pools": [ { "pool": "192.0.2.2-192.0.2.99" } ],
-                        "subnet": "192.0.2.0/24",
-                        "option-data": [
-                            {
-                                "name": "routers",
-                                "data": "192.0.2.1"
-                            }
-                        ]
-                    },
+                        \"name\": \"routers\",
+                        \"data\": \"192.0.2.1\"
+                    }
+                ]
+            },
+            {
+                \"id\": 101,
+                \"pools\": [ { \"pool\": \"192.0.3.2-192.0.3.99\" } ],
+                \"subnet\": \"192.0.3.0/24\",
+                \"option-data\": [
                     {
-                        "id": 101,
-                        "pools": [ { "pool": "192.0.3.2-192.0.3.99" } ],
-                        "subnet": "192.0.3.0/24",
-                        "option-data": [
-                            {
-                                "name": "routers",
-                                "data": "192.0.3.1"
-                            }
-                        ]
-                    } ]
+                        \"name\": \"routers\",
+                        \"data\": \"192.0.3.1\"
+                    }
+                ]
             } ]
-        }
-    },
-    "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).",
-    "resp-syntax": {
-        "arguments": {
-            "shared-networks": [ { "name": "floor13" } ]
-        },
-        "result": 0,
-        "text": "A new IPv4 shared network 'floor13' added"
+        } ]
     }
+}",
+    "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).",
+    "resp-syntax": "{
+    \"arguments\": {
+        \"shared-networks\": [ { \"name\": \"floor13\" } ]
+    },
+    \"result\": 0,
+    \"text\": \"A new IPv4 shared network 'floor13' added\"
+}"
 }
diff --git a/doc/sphinx/api/network6-del.json b/doc/sphinx/api/network6-del.json
index e0f707bc59..7217336f84 100644
--- a/doc/sphinx/api/network6-del.json
+++ b/doc/sphinx/api/network6-del.json
@@ -5,18 +5,19 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-del",
-        "arguments": {
-            "name": "floor13"
-        }
-    },
-    "cmd-comment": "The network6-del command uses exactly the same syntax for both the command and the response.",
-    "resp-syntax": {
-        "command": "network4-del",
-        "arguments": {
-            "name": "floor13",
-            "subnets-action": "delete"
-        }
+    "cmd-syntax": "{
+    \"command\": \"network4-del\",
+    \"arguments\": {
+        \"name\": \"floor13\"
     }
+}",
+    "cmd-comment": "The network6-del command uses exactly the same syntax for
+                    both the command and the response.",
+    "resp-syntax": "{
+    \"command\": \"network4-del\",
+    \"arguments\": {
+        \"name\": \"floor13\",
+        \"subnets-action\": \"delete\"
+    }
+}"
 }
diff --git a/doc/sphinx/api/network6-get.json b/doc/sphinx/api/network6-get.json
index f113d76eda..99807eaadc 100644
--- a/doc/sphinx/api/network6-get.json
+++ b/doc/sphinx/api/network6-get.json
@@ -5,41 +5,43 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-get",
-        "arguments": {
-            "name": "floor13"
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "Info about IPv4 shared network 'floor13' returned",
-        "arguments": {
-            "shared-networks": [
+    "cmd-syntax": "{
+    \"command\": \"network4-get\",
+    \"arguments\": {
+        \"name\": \"floor13\"
+    }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Info about IPv4 shared network 'floor13' returned\",
+    \"arguments\": {
+        \"shared-networks\": [
+        {
+            \"match-client-id\": true,
+            \"name\": \"floor13\",
+            \"option-data\": [ ],
+            \"rebind-timer\": 90,
+            \"relay\": {
+                \"ip-address\": \"0.0.0.0\"
+            },
+            \"renew-timer\": 60,
+            \"reservation-mode\": \"all\",
+            \"subnet4\": [
+                {
+                    \"subnet\": \"192.0.2.0/24\",
+                    \"id\": 5,
+                    // many other subnet specific details here
+                },
                 {
-                    "match-client-id": true,
-                    "name": "floor13",
-                    "option-data": [ ],
-                    "rebind-timer": 90,
-                    "relay": {
-                        "ip-address": "0.0.0.0"
-                    },
-                    "renew-timer": 60,
-                    "reservation-mode": "all",
-                    "subnet4": [
-                        {
-                            "subnet": "192.0.2.0/24",
-                            "id": 5
-                        },
-                        {
-                            "id": 6,
-                            "subnet": "192.0.3.0/31"
-                        }
-                    ],
-                    "valid-lifetime": 120
+                    \"id\": 6,
+                    \"subnet\": \"192.0.3.0/31\",
+                    // many other subnet specific details here
                 }
-            ]
+            ],
+            \"valid-lifetime\": 120
         }
-    },
+        ]
+    }
+}",
     "resp-comment": "Note that the actual response contains many additional fields that are omitted here for clarity."
 }
diff --git a/doc/sphinx/api/network6-list.json b/doc/sphinx/api/network6-list.json
index fa6d0d43d2..4febd2ce3a 100644
--- a/doc/sphinx/api/network6-list.json
+++ b/doc/sphinx/api/network6-list.json
@@ -5,15 +5,18 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
+    "cmd-syntax": "{
+    \"command\": \"network4-list\"
+}",
     "cmd-comment": "network6-list follows exactly the same syntax for both the query and the response.",
-    "resp-syntax": {
-        "arguments": {
-            "shared-networks": [
-                { "name": "floor1" },
-                { "name": "office" }
-            ]
-        },
-        "result": 0,
-        "text": "2 IPv4 network(s) found"
-    }
+    "resp-syntax": "{
+    \"arguments\": {
+        \"shared-networks\": [
+            { \"name\": \"floor1\" },
+            { \"name\": \"office\" }
+        ]
+    },
+    \"result\": 0,
+    \"text\": \"2 IPv4 network(s) found\"
+}"
 }
diff --git a/doc/sphinx/api/network6-subnet-add.json b/doc/sphinx/api/network6-subnet-add.json
index 008eb96a69..a23a45e6c2 100644
--- a/doc/sphinx/api/network6-subnet-add.json
+++ b/doc/sphinx/api/network6-subnet-add.json
@@ -5,16 +5,16 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-subnet-add",
-        "arguments": {
-            "name": "floor13",
-            "id": 5
-        }
-    },
-    "cmd-comment": "The network6-subnet-add command uses exactly the same syntax for both the command and the response.",
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network 'floor1'"
+    "cmd-syntax": "{
+    \"command\": \"network4-subnet-add\",
+    \"arguments\": {
+        \"name\": \"floor13\",
+        \"id\": 5
     }
+}",
+    "cmd-comment": "The network6-subnet-add command uses exactly the same syntax for both the command and the response.",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now part of shared network 'floor1'\"
+}"
 }
diff --git a/doc/sphinx/api/network6-subnet-del.json b/doc/sphinx/api/network6-subnet-del.json
index 356490e7cd..4b43e7fce2 100644
--- a/doc/sphinx/api/network6-subnet-del.json
+++ b/doc/sphinx/api/network6-subnet-del.json
@@ -5,16 +5,16 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "network4-subnet-del",
-        "arguments": {
-            "name": "floor13",
-            "id": 5
-        }
-    },
-    "cmd-comment": "The network6-subnet-del command uses exactly the same syntax for both the command and the response.",
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network 'floor13'"
+    "cmd-syntax": "{
+    \"command\": \"network4-subnet-del\",
+    \"arguments\": {
+        \"name\": \"floor13\",
+        \"id\": 5
     }
+ }",
+    "cmd-comment": "The network6-subnet-del command uses exactly the same syntax for both the command and the response.",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet 10.0.0.0/8 (id 5) is now removed from shared network 'floor13'\"
+}"
 }
diff --git a/doc/sphinx/api/reservation-add.json b/doc/sphinx/api/reservation-add.json
index b11a0db6ff..17818261ec 100644
--- a/doc/sphinx/api/reservation-add.json
+++ b/doc/sphinx/api/reservation-add.json
@@ -1,34 +1,54 @@
 {
     "name": "reservation-add",
-    "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.",
+    "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.",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "hook": "host_cmds",
     "avail": "1.2.0",
     "description": "See <xref linkend=\"cmd-reservation-add\"/>",
 
-    "cmd-syntax": {
-        "command": "reservation-add",
-        "arguments": {
-            "reservation": {
-                "boot-file-name": "<string>",
-                "comment": "<string>",
-                "client-id": "<string>",
-                "circuit-id": "<string>",
-                "duid": "<string>",
-                "flex-id": "<string>",
-                "ip-address": "<string (IPv4 address)>",
-                "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>" ],
-                "server-hostname": "<string>",
-                "subnet-id": "<integer>",
-                "user-context": "<any valid JSON>"
-            }
+    "cmd-syntax": "{
+    \"command\": \"reservation-add\",
+    \"arguments\": {
+        \"reservation\": {
+            \"boot-file-name\": <string>,
+            \"comment\": <string>
+            \"client-id\": <string>,
+            \"circuit-id\": <string>,
+            \"duid\": <string>,
+            \"flex-id\": <string>,
+            \"ip-address\": <string (IPv4 address)>,
+            \"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> ],
+            \"server-hostname\": <string>,
+            \"subnet-id\": <integer>,
+            \"user-context\": <any valid JSON>,
         }
-    },
-    "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."
+    }
+}",
+    "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.",
+
+    "resp-syntax": "
+{
+    \"result\": <integer>,
+    \"text\": <string>
+}",
+    "resp-comment": "Result is an integer representation of the status. Currently supported statuses are:
+<itemizedlist>
+  <listitem><para>0 - success</para></listitem>
+  <listitem><para>1 - error</para></listitem>
+  <listitem><para>2 - unsupported</para></listitem>
+  <listitem><para>3 - empty (command was completed successfully, but no data was affected or returned)
+  </para></listitem>
+</itemizedlist>"
 }
+
diff --git a/doc/sphinx/api/reservation-del.json b/doc/sphinx/api/reservation-del.json
index 46c8fc7164..48d5938bc1 100644
--- a/doc/sphinx/api/reservation-del.json
+++ b/doc/sphinx/api/reservation-del.json
@@ -5,14 +5,14 @@
     "hook": "host_cmds",
     "avail": "1.2.0",
 
-    "cmd-syntax": {
-        "command": "reservation-del",
-        "arguments": {
-            "subnet-id": "<integer>",
-            "ip-address": "<string>",
-            "identifier-type": "<one of 'hw-address', 'duid', 'circuit-id', 'client-id' and 'flex-id'>",
-            "identifier": "<string>"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"reservation-del\",
+    \"arguments\": {
+        \"subnet-id\": <integer>,
+        \"ip-address\": <string>,
+        \"identifier-type\": <one of \"hw-address\", \"duid\", \"circuit-id\", \"client-id\" and \"flex-id\">,
+        \"identifier\": <string>
+    }
+}",
     "cmd-comment": "The host reservation can be identified by either (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier)."
 }
diff --git a/doc/sphinx/api/reservation-get-all.json b/doc/sphinx/api/reservation-get-all.json
index b3bcca3a73..75b9ef85df 100644
--- a/doc/sphinx/api/reservation-get-all.json
+++ b/doc/sphinx/api/reservation-get-all.json
@@ -5,11 +5,10 @@
     "hook": "host_cmds",
     "avail": "1.6.0",
 
-    "cmd-syntax": {
-        "command": "reservation-get-all",
-        "arguments": {
-            "subnet-id": "<integer>"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"reservation-get-all\",
+    \"arguments\": {
+        \"subnet-id\": <integer>
+}",
     "resp-comment": "reservation-get-all command may result in very large responses."
 }
diff --git a/doc/sphinx/api/reservation-get-page.json b/doc/sphinx/api/reservation-get-page.json
index 3dfa7bbdf9..04796acec7 100644
--- a/doc/sphinx/api/reservation-get-page.json
+++ b/doc/sphinx/api/reservation-get-page.json
@@ -5,14 +5,14 @@
     "hook": "host_cmds",
     "avail": "1.6.0",
 
-    "cmd-syntax": {
-        "command": "reservation-get-page",
-        "arguments": {
-            "subnet-id": "<integer>",
-            "limit": "<integer>",
-            "source-index": "<integer>",
-            "from": "<integer>"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"reservation-get-page\",
+    \"arguments\": {
+        \"subnet-id\": <integer>,
+        \"limit\": <integer>,
+        \"source-index\": <integer>,
+        \"from\": <integer>
+    }
+}",
     "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."
 }
diff --git a/doc/sphinx/api/reservation-get.json b/doc/sphinx/api/reservation-get.json
index d0cb797b6b..ef359b0928 100644
--- a/doc/sphinx/api/reservation-get.json
+++ b/doc/sphinx/api/reservation-get.json
@@ -5,40 +5,41 @@
     "hook": "host_cmds",
     "avail": "1.2.0",
 
-    "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>"
-        }
-    },
+    "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>;
+    }
+}",
 
     "cmd-comment": "The host reservation can be identified by either (subnet-id, ip-address) pair or a triplet of (subnet-id, identifier-type, identifier).",
 
-    "resp-syntax": {
-        "result": "<integer>",
-        "text": "<string>",
-        "arguments": {
-            "boot-file-name": "<string>",
-        "comment": "<string>",
-            "client-id": "<string>",
-            "circuit-id": "<string>",
-            "duid": "<string>",
-            "flex-id": "<string>",
-            "ip-address": "<string (IPv4 address)>",
-            "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>" ],
-            "server-hostname": "<string>",
-            "subnet-id": "<integer>",
-            "user-context": "<any valid JSON>"
-        }
-    },
+    "resp-syntax": "{
+    \"result\": <integer>,
+    \"text\": <string>,
+    \"arguments\": {
+        \"boot-file-name\": <string>,
+        \"comment\": <string>
+        \"client-id\": <string>,
+        \"circuit-id\": <string>,
+        \"duid\": <string>,
+        \"flex-id\": <string>,
+        \"ip-address\": <string (IPv4 address)>,
+        \"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> ],
+        \"server-hostname\": <string>,
+        \"subnet-id\": <integer>,
+        \"user-context\": <any valid JSON>,
+    }
+}",
 
-    "resp-comment": "Arguments object appear only if a host is found. Many fields in the arguments object appear only if specific field is set."
+    "resp-comment": "Arguments object appear only if a host is found. Many fields in the arguments
+object appear only if specific field is set."
 }
diff --git a/doc/sphinx/api/shutdown.json b/doc/sphinx/api/shutdown.json
index 21b1934e90..6c9cc305b4 100644
--- a/doc/sphinx/api/shutdown.json
+++ b/doc/sphinx/api/shutdown.json
@@ -4,5 +4,9 @@
     "description": "See <xref linkend=\"command-shutdown\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
     "avail": "1.0.0",
-    "cmd-comment": "The server will respond with a confirmation that the shutdown procedure has been initiated."
+    "cmd-syntax": "{
+    \"command\": \"shutdown\"
+}",
+    "cmd-comment": "The server will respond with a confirmation that the shutdown
+                    procedure has been initiated."
 }
diff --git a/doc/sphinx/api/stat-lease4-get.json b/doc/sphinx/api/stat-lease4-get.json
index 5ade9fcb74..b155d9c7ff 100644
--- a/doc/sphinx/api/stat-lease4-get.json
+++ b/doc/sphinx/api/stat-lease4-get.json
@@ -1,28 +1,29 @@
 {
     "name": "stat-lease4-get",
-    "brief": "The stat-lease4-get command fetches lease statistics for a range of known IPv4 subnets.",
+    "brief": "The stat-lease4-get command fetches lease statistics for a range
+              of known IPv4 subnets.",
     "description": "See <xref linkend=\"command-stat-lease4-get\"/>",
     "support": [ "kea-dhcp4" ],
     "avail": "1.4.0",
     "hook": "stat_cmds",
-    "cmd-syntax": {
-        "command": "stat-lease4-get"
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "stat-lease4-get: 2 rows found",
-        "arguments": {
-            "result-set": {
-                "columns": [ "subnet-id",
-                             "total-addresses",
-                             "assigned-addresses",
-                             "declined-addresses" ],
-                "rows": [
-                    [ 10, 256, 111, 0 ],
-                    [ 20, 4098, 2034, 4 ]
-                ],
-                "timestamp": "2018-05-04 15:03:37.000000"
-            }
-        }
+    "cmd-syntax": "{
+  \"command\": \"stat-lease4-get\"
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"stat-lease4-get: 2 rows found\",
+    \"arguments\": {
+      \"result-set\": {
+        \"columns\": [ \"subnet-id\",
+                       \"total-addresses\",
+                       \"assigned-addresses\",
+                       \"declined-addresses\" ]
+        \"rows\": [
+          [ 10, 256, 111, 0 ],
+          [ 20, 4098, 2034, 4 ]
+        ],
+      \"timestamp\": \"2018-05-04 15:03:37.000000\"
+      }
     }
+  }"
 }
diff --git a/doc/sphinx/api/stat-lease6-get.json b/doc/sphinx/api/stat-lease6-get.json
index 70f9e6f4c6..3834d7320c 100644
--- a/doc/sphinx/api/stat-lease6-get.json
+++ b/doc/sphinx/api/stat-lease6-get.json
@@ -1,29 +1,30 @@
 {
     "name": "stat-lease6-get",
-    "brief": "The stat-lease6-get command fetches lease statistics for a range of known IPv6 subnets.",
+    "brief": "The stat-lease6-get command fetches lease statistics for a range
+              of known IPv6 subnets.",
     "description": "See <xref linkend=\"command-stat-lease6-get\"/>",
     "support": [ "kea-dhcp6" ],
     "avail": "1.4.0",
     "hook": "stat_cmds",
-    "cmd-syntax": {
-        "command": "stat-lease6-get",
-        "arguments": {
-            "subnet-id" : 10
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "stat-lease6-get: 2 rows found",
-        "arguments": {
-            "result-set": {
-                "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 ],
-                    [ 30, 256, 60, 0, 1048, 15 ]
-                ],
-                "timestamp": "2018-05-04 15:03:37.000000"
-            }
-        }
+    "cmd-syntax": "{
+  \"command\": \"stat-lease6-get\",
+  \"arguments\": {
+    \"subnet-id\" : 10
+  }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"stat-lease6-get: 2 rows found\",
+    \"arguments\": {
+      \"result-set\": {
+        \"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 ]
+          [ 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 2dd7218d2e..fcfdce1161 100644
--- a/doc/sphinx/api/statistic-get-all.json
+++ b/doc/sphinx/api/statistic-get-all.json
@@ -4,9 +4,9 @@
     "description": "See <xref linkend=\"command-statistic-get-all\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "statistic-get-all",
-        "arguments": { }
-    },
+    "cmd-syntax": "{
+    \"command\": \"statistic-get-all\",
+    \"arguments\": { }
+}",
     "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)."
 }
diff --git a/doc/sphinx/api/statistic-get.json b/doc/sphinx/api/statistic-get.json
index aa2fb895b5..97cf96ef87 100644
--- a/doc/sphinx/api/statistic-get.json
+++ b/doc/sphinx/api/statistic-get.json
@@ -4,11 +4,11 @@
     "description": "See <xref linkend=\"command-statistic-get\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "statistic-get",
-        "arguments": {
-            "name": "pkt4-received"
-        }
-    },
-    "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."
+    "cmd-syntax": "{
+    \"command\": \"statistic-get\",
+    \"arguments\": {
+        \"name\": \"pkt4-received\"
+    }
+}",
+    "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."
 }
diff --git a/doc/sphinx/api/statistic-remove-all.json b/doc/sphinx/api/statistic-remove-all.json
index 4d25d191ef..b1cae435b3 100644
--- a/doc/sphinx/api/statistic-remove-all.json
+++ b/doc/sphinx/api/statistic-remove-all.json
@@ -4,9 +4,9 @@
     "description": "See <xref linkend=\"command-statistic-remove-all\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "statistic-remove-all",
-        "arguments": { }
-    },
+    "cmd-syntax": "{
+    \"command\": \"statistic-remove-all\",
+    \"arguments\": { }
+}",
     "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."
 }
diff --git a/doc/sphinx/api/statistic-remove.json b/doc/sphinx/api/statistic-remove.json
index e625d6ae2a..8e3eaa6874 100644
--- a/doc/sphinx/api/statistic-remove.json
+++ b/doc/sphinx/api/statistic-remove.json
@@ -4,11 +4,11 @@
     "description": "See <xref linkend=\"command-statistic-remove\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "statistic-remove",
-        "arguments": {
-            "name": "pkt4-received"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"statistic-remove\",
+    \"arguments\": {
+        \"name\": \"pkt4-received\"
+    }
+}",
     "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."
 }
diff --git a/doc/sphinx/api/statistic-reset-all.json b/doc/sphinx/api/statistic-reset-all.json
index 5f2df3cf02..e87ab26c68 100644
--- a/doc/sphinx/api/statistic-reset-all.json
+++ b/doc/sphinx/api/statistic-reset-all.json
@@ -4,9 +4,9 @@
     "description": "See <xref linkend=\"command-statistic-reset-all\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "statistic-reset-all",
-        "arguments": { }
-    },
+    "cmd-syntax": "{
+    \"command\": \"statistic-reset-all\",
+    \"arguments\": { }
+}",
     "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."
 }
diff --git a/doc/sphinx/api/statistic-reset.json b/doc/sphinx/api/statistic-reset.json
index 3a5cd9f68a..c06162aef4 100644
--- a/doc/sphinx/api/statistic-reset.json
+++ b/doc/sphinx/api/statistic-reset.json
@@ -4,11 +4,11 @@
     "description": "See <xref linkend=\"command-statistic-reset\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6" ],
     "avail": "1.0.0",
-    "cmd-syntax": {
-        "command": "statistic-reset",
-        "arguments": {
-            "name": "pkt4-received"
-        }
-    },
+    "cmd-syntax": "{
+    \"command\": \"statistic-reset\",
+    \"arguments\": {
+        \"name\": \"pkt4-received\"
+    }
+}",
     "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."
 }
diff --git a/doc/sphinx/api/subnet4-add.json b/doc/sphinx/api/subnet4-add.json
index d87201cf35..14daab1bb8 100644
--- a/doc/sphinx/api/subnet4-add.json
+++ b/doc/sphinx/api/subnet4-add.json
@@ -5,25 +5,26 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet4-add",
-        "arguments": {
-            "subnets": [ {
-                "id": 123,
-                "subnet": "10.20.30.0/24"
-            } ]
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet added",
-        "arguments": {
-            "subnets": [
-                {
-                    "id": 123,
-                    "subnet": "10.20.30.0/24"
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet4-add\",
+    \"arguments\": {
+        \"subnets\": [ {
+            \"id\": 123,
+            \"subnet\": \"10.20.30.0/24\",
+            ...
+        } ]
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet added\",
+    \"arguments\": {
+        \"subnets\": [
+            {
+                \"id\": 123,
+                \"subnet\": \"10.20.30.0/24\"
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/subnet4-del.json b/doc/sphinx/api/subnet4-del.json
index 1493939d23..3adf0d59a7 100644
--- a/doc/sphinx/api/subnet4-del.json
+++ b/doc/sphinx/api/subnet4-del.json
@@ -5,22 +5,22 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet4-del",
-        "arguments": {
-            "id": 123
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet 192.0.2.0/24 (id 123) deleted",
-        "arguments": {
-            "subnets": [
-                {
-                    "id": 123,
-                    "subnet": "192.0.2.0/24"
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet4-del\",
+    \"arguments\": {
+        \"id\": 123
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet 192.0.2.0/24 (id 123) deleted\",
+    \"arguments\": {
+        \"subnets\": [
+            {
+                \"id\": 123,
+                \"subnet\": \"192.0.2.0/24\"
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/subnet4-get.json b/doc/sphinx/api/subnet4-get.json
index d918304f82..69d52202dc 100644
--- a/doc/sphinx/api/subnet4-get.json
+++ b/doc/sphinx/api/subnet4-get.json
@@ -5,24 +5,26 @@
     "support": [ "kea-dhcp4" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet4-get",
-        "arguments": {
-            "id": 10
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "Info about IPv4 subnet 10.0.0.0/8 (id 10) returned",
-        "arguments": {
-            "subnets": [
-                {
-                    "subnet": "10.0.0.0/8",
-                    "id": 1,
-                    "option-data": [
-                    ]
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet4-get\",
+    \"arguments\": {
+        \"id\": 10
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Info about IPv4 subnet 10.0.0.0/8 (id 10) returned\",
+    \"arguments\": {
+        \"subnets\": [
+            {
+                \"subnet\": \"10.0.0.0/8\",
+                \"id\": 1,
+                \"option-data\": [
+                    ....
+                ]
+                ...
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/subnet4-list.json b/doc/sphinx/api/subnet4-list.json
index 23d469af9b..e514cbfd56 100644
--- a/doc/sphinx/api/subnet4-list.json
+++ b/doc/sphinx/api/subnet4-list.json
@@ -5,24 +5,23 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet4-list"
-    },
-    "resp-syntax": {
-        "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"
-                }
-            ]
+    "cmd-syntax": "{
+    \"command\": \"subnet4-list\"
+}",
+    "resp-syntax": "{
+    \"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\"
         }
-    },
+    ]
+}",
     "resp-comment": "If no IPv4 subnets are found, an error code is returned along with the error description."
-}
+}
\ No newline at end of file
diff --git a/doc/sphinx/api/subnet4-update.json b/doc/sphinx/api/subnet4-update.json
index b7c561aa10..5926b47dc5 100644
--- a/doc/sphinx/api/subnet4-update.json
+++ b/doc/sphinx/api/subnet4-update.json
@@ -5,25 +5,26 @@
     "support": [ "kea-dhcp4"],
     "avail": "1.6.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet4-update",
-        "arguments": {
-            "subnets": [ {
-                "id": 123,
-                "subnet": "10.20.30.0/24"
-            } ]
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv4 subnet updated",
-        "arguments": {
-            "subnets": [
-                {
-                    "id": 123,
-                    "subnet": "10.20.30.0/24"
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet4-update\",
+    \"arguments\": {
+        \"subnets\": [ {
+            \"id\": 123,
+            \"subnet\": \"10.20.30.0/24\",
+            ...
+        } ]
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv4 subnet updated\",
+    \"arguments\": {
+        \"subnets\": [
+            {
+                \"id\": 123,
+                \"subnet\": \"10.20.30.0/24\"
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/subnet6-add.json b/doc/sphinx/api/subnet6-add.json
index 1371618732..727241f246 100644
--- a/doc/sphinx/api/subnet6-add.json
+++ b/doc/sphinx/api/subnet6-add.json
@@ -5,25 +5,26 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet6-add",
-        "arguments": {
-            "subnet6": [ {
-                "id": 234,
-                "subnet": "2001:db8:1::/64"
-            } ]
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv6 subnet added",
-        "arguments": {
-            "subnet6": [
-                {
-                    "id": 234,
-                    "subnet": "2001:db8:1::/64"
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet6-add\",
+    \"arguments\": {
+        \"subnet6\": [ {
+            \"id\": 234,
+            \"subnet\": \"2001:db8:1::/64\",
+            ...
+        } ]
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv6 subnet added\",
+    \"arguments\": {
+        \"subnet6\": [
+            {
+                \"id\": 234,
+                \"subnet\": \"2001:db8:1::/64\"
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/subnet6-del.json b/doc/sphinx/api/subnet6-del.json
index a54879b2a2..d95e48828c 100644
--- a/doc/sphinx/api/subnet6-del.json
+++ b/doc/sphinx/api/subnet6-del.json
@@ -5,20 +5,20 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet6-del",
-        "arguments": {
-            "id": 234
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv6 subnet 2001:db8:1::/64 (id 234) deleted",
-        "subnets": [
-            {
-                "id": 234,
-                "subnet": "2001:db8:1::/64"
-            }
-        ]
+    "cmd-syntax": "{
+    \"command\": \"subnet6-del\",
+    \"arguments\": {
+        \"id\": 234
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv6 subnet 2001:db8:1::/64 (id 234) deleted\",
+    \"subnets\": [
+        {
+            \"id\": 234,
+            \"subnet\": \"2001:db8:1::/64\"
+        }
+    ]
+}"
 }
diff --git a/doc/sphinx/api/subnet6-get.json b/doc/sphinx/api/subnet6-get.json
index 3dcc1a83fa..cc9e921677 100644
--- a/doc/sphinx/api/subnet6-get.json
+++ b/doc/sphinx/api/subnet6-get.json
@@ -5,24 +5,26 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet6-get",
-        "arguments": {
-            "id": 11
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "Info about IPv6 subnet 2001:db8:1::/64 (id 11) returned",
-        "arguments": {
-            "subnets": [
-                {
-                    "subnet": "2001:db8:1::/64",
-                    "id": 1,
-                    "option-data": [
-                    ]
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet6-get\",
+    \"arguments\": {
+        \"id\": 11
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"Info about IPv6 subnet 2001:db8:1::/64 (id 11) returned\",
+    \"arguments\": {
+        \"subnets\": [
+            {
+                \"subnet\": \"2001:db8:1::/64\",
+                \"id\": 1,
+                \"option-data\": [
+                    ...
+                ]
+                ....
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/subnet6-list.json b/doc/sphinx/api/subnet6-list.json
index 374b38e06f..fc95177c57 100644
--- a/doc/sphinx/api/subnet6-list.json
+++ b/doc/sphinx/api/subnet6-list.json
@@ -5,24 +5,23 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.3.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet6-list"
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "2 IPv6 subnets found",
-        "arguments": {
-            "subnets": [
-                {
-                    "id": 11,
-                    "subnet": "2001:db8:1::/64"
-                },
-                {
-                    "id": 233,
-                    "subnet": "3000::/16"
-                }
-            ]
+    "cmd-syntax": "{
+    \"command\": \"subnet6-list\"
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"2 IPv6 subnets found\",
+    \"arguments\": {
+    \"subnets\": [
+        {
+            \"id\": 11,
+            \"subnet\": \"2001:db8:1::/64\"
+        },
+        {
+            \"id\": 233,
+            \"subnet\": \"3000::/16\"
         }
-    },
+    ]
+}",
     "resp-comment": "If no IPv6 subnets are found, an error code is returned along with the error description."
-}
+}
\ No newline at end of file
diff --git a/doc/sphinx/api/subnet6-update.json b/doc/sphinx/api/subnet6-update.json
index 94f3fc1a82..9360a37799 100644
--- a/doc/sphinx/api/subnet6-update.json
+++ b/doc/sphinx/api/subnet6-update.json
@@ -5,25 +5,26 @@
     "support": [ "kea-dhcp6" ],
     "avail": "1.6.0",
     "hook": "subnet_cmds",
-    "cmd-syntax": {
-        "command": "subnet6-update",
-        "arguments": {
-            "subnet6": [ {
-                "id": 234,
-                "subnet": "2001:db8:1::/64"
-            } ]
-        }
-    },
-    "resp-syntax": {
-        "result": 0,
-        "text": "IPv6 subnet updated",
-        "arguments": {
-            "subnet6": [
-                {
-                    "id": 234,
-                    "subnet": "2001:db8:1::/64"
-                }
-            ]
-        }
+    "cmd-syntax": "{
+    \"command\": \"subnet6-update\",
+    \"arguments\": {
+        \"subnet6\": [ {
+            \"id\": 234,
+            \"subnet\": \"2001:db8:1::/64\",
+            ...
+        } ]
     }
+}",
+    "resp-syntax": "{
+    \"result\": 0,
+    \"text\": \"IPv6 subnet updated\",
+    \"arguments\": {
+        \"subnet6\": [
+            {
+                \"id\": 234,
+                \"subnet\": \"2001:db8:1::/64\"
+            }
+        ]
+    }
+}"
 }
diff --git a/doc/sphinx/api/version-get.json b/doc/sphinx/api/version-get.json
index 1ab9c35cfe..e9c192c25f 100644
--- a/doc/sphinx/api/version-get.json
+++ b/doc/sphinx/api/version-get.json
@@ -1,7 +1,12 @@
 {
     "name": "version-get",
-    "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.",
+    "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.",
     "description": "See <xref linkend=\"command-version-get\"/>",
     "support": [ "kea-dhcp4", "kea-dhcp6", "kea-dhcp-ddns", "kea-ctrl-agent" ],
-    "avail": "1.2.0"
+    "avail": "1.2.0",
+    "cmd-syntax": "{
+    \"command\": \"version-get\"
+}"
 }