From: Francis Dupont <fdupont@isc.org>
Date: Fri, 15 Jul 2016 12:48:33 +0000 (+0200)
Subject: [4273] Italic and indent
X-Git-Tag: trac4551_base~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b46438530048a401dc55b701d546f54c117d866;p=thirdparty%2Fkea.git

[4273] Italic and indent
---

diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index f40019cfbf..9e204c398d 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -2437,8 +2437,8 @@ It is merely echoed by the server
       The <command>dhcp4o6-port</command> global parameter specifies
       the first of the two consecutive ports of the UDP sockets used
       for the communication between the DHCPv6 and DHCPv4 servers
-      (the DHCPv4 server is bound to ::1 on port + 1 and connected
-      to ::1 on port).
+      (the DHCPv4 server is bound to ::1 on <command>port</command> + 1
+      and connected to ::1 on <command>port</command>).
       </para>
       <para>
       With DHCPv4-over-DHCPv6 the DHCPv4 server does not have access
@@ -2471,44 +2471,38 @@ It is merely echoed by the server
 {
 
 # DHCPv4 conf
-"Dhcp4":
-{
-  "interfaces-config": {
-    "interfaces": [ "eno33554984" ]
-  },
+"Dhcp4": {
+    "interfaces-config": {
+        "interfaces": [ "eno33554984" ]
+    },
 
-  "lease-database": {
-    "type": "memfile",
-    "name": "leases4"
-  },
+    "lease-database": {
+        "type": "memfile",
+        "name": "leases4"
+    },
 
-  "valid-lifetime": 4000,
+    "valid-lifetime": 4000,
 
-  "subnet4": [
-   {    "subnet": "10.10.10.0/24",
+    "subnet4": [ {
+        "subnet": "10.10.10.0/24",
         <userinput>"4o6-interface": "eno33554984",</userinput>
         <userinput>"4o6-subnet": "2001:db8:1:1::/64",</userinput>
-        "pools": [ { "pool": "10.10.10.100 - 10.10.10.199" } ] }
-  ],
+        "pools": [ { "pool": "10.10.10.100 - 10.10.10.199" } ]
+    } ],
 
-  <userinput>"dhcp4o6-port": 6767</userinput>
+    <userinput>"dhcp4o6-port": 6767</userinput>
 
 },
 
-"Logging":
-{
-  "loggers": [
-    {
-      "name": "kea-dhcp4",
-      "output_options": [
-          {
+"Logging": {
+    "loggers": [ {
+        "name": "kea-dhcp4",
+        "output_options": [ {
             "output": "/tmp/kea-dhcp4.log"
-          }
-      ],
-      "severity": "DEBUG",
-      "debuglevel": 0
-    }
-  ]
+        } ],
+        "severity": "DEBUG",
+        "debuglevel": 0
+    } ]
 }
 
 }
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index 3cd9fac912..e46c161dc7 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -2200,7 +2200,8 @@ should include options from the isc option space:
       <command>dhcp4o6-port</command> which specifies the first of the
       two consecutive ports of the UDP sockets used for the communication
       between the DHCPv6 and DHCPv4 servers (the DHCPv6 server is bound
-      to ::1 on port and connected to ::1 on port + 1).
+      to ::1 on <command>port</command> and connected to ::1 on
+      <command>port</command> + 1).
       </para>
       <para>
       Two other configuration entries are in general required: unicast traffic
@@ -2213,54 +2214,49 @@ should include options from the isc option space:
 {
 
 # DHCPv6 conf
-"Dhcp6":
-{
-  "interfaces-config": {
-    "interfaces": [ "eno33554984/2001:db8:1:1::1" ]
-  },
-
-  "lease-database": {
-    "type": "memfile",
-    "name": "leases6"
-  },
-
-  "preferred-lifetime": 3000,
-  "valid-lifetime": 4000,
-  "renew-timer": 1000,
-  "rebind-timer": 2000,
-
-  "subnet6": [
-   {   "subnet": "2001:db8:1:1::/64",
-       "interface": "eno33554984",
-       "pools": [ { "pool": "2001:db8:1:1::1:0/112" } ] }
-   ],
-
-  <userinput>"dhcp4o6-port": 6767,
-
-  "option-data": [
-   {  "name": "dhcp4o6-server-addr",
-      "code": 88,
-      "space": "dhcp6",
-      "csv-format": true,
-      "data": "2001:db8:1:1::1" }
-   ]
+"Dhcp6": {
+
+    "interfaces-config": {
+        "interfaces": [ "eno33554984/2001:db8:1:1::1" ]
+    },
+
+    "lease-database": {
+        "type": "memfile",
+        "name": "leases6"
+    },
+
+    "preferred-lifetime": 3000,
+    "valid-lifetime": 4000,
+    "renew-timer": 1000,
+    "rebind-timer": 2000,
+
+    "subnet6": [ {
+        "subnet": "2001:db8:1:1::/64",
+        "interface": "eno33554984",
+        "pools": [ { "pool": "2001:db8:1:1::1:0/112" } ]
+    } ],
+
+    <userinput>"dhcp4o6-port": 6767,
+
+    "option-data": [ {
+        "name": "dhcp4o6-server-addr",
+        "code": 88,
+        "space": "dhcp6",
+        "csv-format": true,
+        "data": "2001:db8:1:1::1"
+    } ]
 </userinput>
 },
 
-"Logging":
-{
-  "loggers": [
-    {
-      "name": "kea-dhcp6",
-      "output_options": [
-          {
+"Logging": {
+    "loggers": [ {
+        "name": "kea-dhcp6",
+        "output_options": [ {
             "output": "/tmp/kea-dhcp6.log"
-          }
-      ],
-      "severity": "DEBUG",
-      "debuglevel": 0
-    }
-  ]
+        } ],
+        "severity": "DEBUG",
+        "debuglevel": 0
+    } ]
 }
 
 }