Browse Source

[3772] Corrections to some examples in the DHCPv4 pools documentation

Stephen Morris 10 years ago
parent
commit
b13b6c9e79
1 changed files with 24 additions and 19 deletions
  1. 24 19
      doc/guide/dhcp4-srv.xml

+ 24 - 19
doc/guide/dhcp4-srv.xml

@@ -567,9 +567,11 @@ temporarily override a list of interface names and listen on all interfaces.
         <screen>
         <screen>
 "Dhcp4": {
 "Dhcp4": {
     "subnet4": [
     "subnet4": [
-        "subnet": "192.0.2.0/24",
+        {
-        <userinput>"id": 1024</userinput>,
+            "subnet": "192.0.2.0/24",
-        ...
+            <userinput>"id": 1024</userinput>,
+            ...
+        }
     ]
     ]
 }
 }
 </screen>
 </screen>
@@ -594,22 +596,22 @@ temporarily override a list of interface names and listen on all interfaces.
     <screen>
     <screen>
 "Dhcp4": {
 "Dhcp4": {
     <userinput>"subnet4": [
     <userinput>"subnet4": [
-        "subnet": "192.0.2.0/24",
+        {
-        "pools": [
+            "subnet": "192.0.2.0/24",
-	    {
+            "pools": [
-	        "pool": "192.0.2.10 - 192.0.2.20"
+                { "pool": "192.0.2.10 - 192.0.2.20" }
-            }
+            ],
-        ]</userinput>,
+            ...
-        ...
+        }
-    ]
+    ]</userinput>
 }</screen>
 }</screen>
 
 
-    Note that subnet is defined as a simple string, but the 'pools' parameter is
+    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 pool definition is enclosed
+    actually a list of pools: for this reason, the pools definition is enclosed
     in square brackets, even though only one range of addresses is
     in square brackets, even though only one range of addresses is
     specified in this example.</para>
     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,
     that describe a single pool. Currently there is only one parameter,
     <command>pool</command>, which gives the range of addresses
     <command>pool</command>, which gives the range of addresses
     in the pool. Additional parameters will be added in future
     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>
 <screen>
 "Dhcp4": {
 "Dhcp4": {
     "subnet4": [
     "subnet4": [
-        <userinput>"pools": [
+        {
-            { "pool": "192.0.2.10-192.0.2.20" },
+            "subnet": "192.0.2.0/24",
-            { "pool": "192.0.2.64/26" }
+            <userinput>"pools": [
-        ]</userinput>,
+                { "pool": "192.0.2.10-192.0.2.20" },
-        ...
+                { "pool": "192.0.2.64/26" }
+            ]</userinput>,
+            ...
+        }
     ],
     ],
     ...
     ...
 }
 }