Parcourir la source

[4273] Italic and indent

Francis Dupont il y a 8 ans
Parent
commit
1b46438530
2 fichiers modifiés avec 65 ajouts et 75 suppressions
  1. 24 30
      doc/guide/dhcp4-srv.xml
  2. 41 45
      doc/guide/dhcp6-srv.xml

+ 24 - 30
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 <command>dhcp4o6-port</command> global parameter specifies
       the first of the two consecutive ports of the UDP sockets used
       the first of the two consecutive ports of the UDP sockets used
       for the communication between the DHCPv6 and DHCPv4 servers
       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>
       <para>
       <para>
       With DHCPv4-over-DHCPv6 the DHCPv4 server does not have access
       With DHCPv4-over-DHCPv6 the DHCPv4 server does not have access
@@ -2471,44 +2471,38 @@ It is merely echoed by the server
 {
 {
 
 
 # DHCPv4 conf
 # 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-interface": "eno33554984",</userinput>
         <userinput>"4o6-subnet": "2001:db8:1:1::/64",</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"
             "output": "/tmp/kea-dhcp4.log"
-          }
-      ],
-      "severity": "DEBUG",
-      "debuglevel": 0
-    }
-  ]
+        } ],
+        "severity": "DEBUG",
+        "debuglevel": 0
+    } ]
 }
 }
 
 
 }
 }

+ 41 - 45
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
       <command>dhcp4o6-port</command> which specifies the first of the
       two consecutive ports of the UDP sockets used for the communication
       two consecutive ports of the UDP sockets used for the communication
       between the DHCPv6 and DHCPv4 servers (the DHCPv6 server is bound
       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>
       <para>
       <para>
       Two other configuration entries are in general required: unicast traffic
       Two other configuration entries are in general required: unicast traffic
@@ -2213,54 +2214,49 @@ should include options from the isc option space:
 {
 {
 
 
 # DHCPv6 conf
 # 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>
 </userinput>
 },
 },
 
 
-"Logging":
-{
-  "loggers": [
-    {
-      "name": "kea-dhcp6",
-      "output_options": [
-          {
+"Logging": {
+    "loggers": [ {
+        "name": "kea-dhcp6",
+        "output_options": [ {
             "output": "/tmp/kea-dhcp6.log"
             "output": "/tmp/kea-dhcp6.log"
-          }
-      ],
-      "severity": "DEBUG",
-      "debuglevel": 0
-    }
-  ]
+        } ],
+        "severity": "DEBUG",
+        "debuglevel": 0
+    } ]
 }
 }
 
 
 }
 }