From 2fc94dcd701f8d38e23e2cb79e83f228f60e1b79 Mon Sep 17 00:00:00 2001
From: Wlodek Wencel <wlodek@isc.org>
Date: Fri, 20 Mar 2015 15:43:39 +0100
Subject: [PATCH] [3772] Corrected minor documentation errors both in v4 and v6
 configuration examples

---
 doc/guide/dhcp4-srv.xml | 18 ++++++++++--------
 doc/guide/dhcp6-srv.xml |  8 +++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 924bdc406d..41bd5852a0 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -1130,7 +1130,7 @@ temporarily override a list of interface names and listen on all interfaces.
 "Dhcp4": {
     "option-data": [
         {
-            <userinput>"name": "foo"
+            <userinput>"name": "foo",
             "space": "vendor-encapsulated-options-space",
             "code": 1,
             "csv-format": true,
@@ -1145,7 +1145,7 @@ temporarily override a list of interface names and listen on all interfaces.
 "Dhcp4": {
     "option-data": [
         {
-            <userinput>"name": "vendor-encapsulated-options"
+            <userinput>"name": "vendor-encapsulated-options",
             "space": "dhcp4",
             "code": 43,
             "csv-format": false,
@@ -1194,7 +1194,7 @@ temporarily override a list of interface names and listen on all interfaces.
             <userinput>"name": "subopt1",
             "code": 1,
             "space": "isc",
-            "type": "ipv4-address".
+            "type": "ipv4-address",
             "record-types": "",
             "array": false,
             "encapsulate ""
@@ -1205,7 +1205,7 @@ temporarily override a list of interface names and listen on all interfaces.
             "space": "isc",
             "type": "string",
             "record-types": "",
-            "array": false
+            "array": false,
             "encapsulate": ""</userinput>
         }
     ],
@@ -1908,12 +1908,12 @@ temporarily override a list of interface names and listen on all interfaces.
 "Dhcp4": {
     <userinput>"next-server": "192.0.2.123"</userinput>,
     ...,
-    "subnet4": {
-        [
+    "subnet4": [
+        {
             <userinput>"next-server": "192.0.2.234"</userinput>,
             ...
-        ]
-    }
+        }
+    ]
 }
 </screen>
     </section>
@@ -2258,9 +2258,11 @@ temporarily override a list of interface names and listen on all interfaces.
 	<screen>
 "Dhcp4": {
     "subnet4": [
+	{
         "subnet": "192.0.2.0/24",
         <userinput>"reservation-mode": "disabled"</userinput>,
         ...
+	}
     ]
 }
 </screen>
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index fe04a9f3da..9f11fbbd54 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -1046,7 +1046,7 @@ temporarily override a list of interface names and listen on all interfaces.
 "Dhcp6": {
     "option-data": [
         {
-            <userinput>"name": "foo"
+            <userinput>"name": "foo",
             "space": "vendor-encapsulated-options-space",
             "code": 1,
             "csv-format": true,
@@ -1063,7 +1063,7 @@ temporarily override a list of interface names and listen on all interfaces.
     "option-data": [
         ...,
         {
-            <userinput>"name": "vendor-encapsulated-options"
+            <userinput>"name": "vendor-encapsulated-options",
             "space": "dhcp6",
             "code": 17,
             "csv-format": true,
@@ -1100,7 +1100,7 @@ temporarily override a list of interface names and listen on all interfaces.
             <userinput>"name": "subopt1",
             "code": 1,
             "space": "isc",
-            "type": "ipv6-address".
+            "type": "ipv6-address",
             "record-types": "",
             "array": false,
             "encapsulate": ""</userinput>
@@ -2146,9 +2146,11 @@ should include options from the isc option space:
 	<screen>
 "Dhcp6": {
     "subnet6": [
+	{
         "subnet": "2001:db8:1::/64",
         <userinput>"reservation-mode": "disabled"</userinput>,
         ...
+	}
     ]
 }
 </screen>
-- 
2.47.2