From b13b6c9e79de5bb8531d1796ac158f7e68d25b8a Mon Sep 17 00:00:00 2001
From: Stephen Morris <stephen@isc.org>
Date: Fri, 20 Mar 2015 12:08:23 +0000
Subject: [PATCH] [3772] Corrections to some examples in the DHCPv4 pools
 documentation

---
 doc/guide/dhcp4-srv.xml | 43 +++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 26adbce102..924bdc406d 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -567,9 +567,11 @@ temporarily override a list of interface names and listen on all interfaces.
         <screen>
 "Dhcp4": {
     "subnet4": [
-        "subnet": "192.0.2.0/24",
-        <userinput>"id": 1024</userinput>,
-        ...
+        {
+            "subnet": "192.0.2.0/24",
+            <userinput>"id": 1024</userinput>,
+            ...
+        }
     ]
 }
 </screen>
@@ -594,22 +596,22 @@ temporarily override a list of interface names and listen on all interfaces.
     <screen>
 "Dhcp4": {
     <userinput>"subnet4": [
-        "subnet": "192.0.2.0/24",
-        "pools": [
-	    {
-	        "pool": "192.0.2.10 - 192.0.2.20"
-            }
-        ]</userinput>,
-        ...
-    ]
+        {
+            "subnet": "192.0.2.0/24",
+            "pools": [
+                { "pool": "192.0.2.10 - 192.0.2.20" }
+            ],
+            ...
+        }
+    ]</userinput>
 }</screen>
 
-    Note that subnet is defined as a simple string, but the 'pools' parameter is
-    actually a list of pools: for this reason, the pool definition is enclosed
+    Note that subnet is defined as a simple string, but the <command>pools</command> parameter is
+    actually a list of pools: for this reason, the pools definition is enclosed
     in square brackets, even though only one range of addresses is
     specified in this example.</para>
 
-    <para>Each <command>pool</command> is a structure that contains the parameters
+    <para>Each pool is a structure that contains the parameters
     that describe a single pool. Currently there is only one parameter,
     <command>pool</command>, which gives the range of addresses
     in the pool. Additional parameters will be added in future
@@ -624,11 +626,14 @@ temporarily override a list of interface names and listen on all interfaces.
 <screen>
 "Dhcp4": {
     "subnet4": [
-        <userinput>"pools": [
-            { "pool": "192.0.2.10-192.0.2.20" },
-            { "pool": "192.0.2.64/26" }
-        ]</userinput>,
-        ...
+        {
+            "subnet": "192.0.2.0/24",
+            <userinput>"pools": [
+                { "pool": "192.0.2.10-192.0.2.20" },
+                { "pool": "192.0.2.64/26" }
+            ]</userinput>,
+            ...
+        }
     ],
     ...
 }
-- 
2.47.2