From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Wed, 13 Jul 2016 14:07:24 +0000 (+0300)
Subject: minor changes to documentation
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cf8d90e06838858a3e33de8d5c9e2713ef0702c;p=thirdparty%2Fkea.git

minor changes to documentation
---

diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index e5a4d4ccdc..178eb17b8c 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -826,8 +826,28 @@ temporarily override a list of interface names and listen on all interfaces.
             The IA PD option responsible for specifying IPv6 address prefixes
             limits the amount of PD Exclude options that it can encapsulate to
             at most one, thus it can only exclude one prefix from a given
-            delegated prefix.
-        </para>
+            delegated prefix. The configuration example below specifies an
+            excluded prefix.
+    </para>
+<screen>
+"Dhcp6": {
+    "subnet6": [
+        {
+            "subnet": "2001:db8:1::/48",
+            "pools": [ { "pool": "2001:db8:1::/80" } ],
+            "pd-pools": [
+                {
+                    "prefix": "2001:db8:1:8000::",
+                    "prefix-len": 48,
+                    "delegated-len": 64,
+                    "excluded-prefix": "2001:db8:1:babe:cafe:80:",
+                    "excluded-prefix-len": 72
+                }
+            ]
+        }
+    ]
+}
+</screen>
     </section>
 
     <section id="dhcp6-std-options">
@@ -1070,7 +1090,7 @@ temporarily override a list of interface names and listen on all interfaces.
 <row><entry>s46-br</entry><entry>90</entry><entry>ipv6-prefix</entry><entry>false</entry></row>
 <row><entry>s46-dmr</entry><entry>91</entry><entry>ipv6-prefix</entry><entry>false</entry></row>
 <row><entry>s46-v4v6bind</entry><entry>92</entry><entry>record(ipv4-address, ipv6-prefix)</entry><entry>false</entry></row>
-<row><entry>s46-portparams</entry><entry>93</entry><entry>empty</entry><entry>false</entry></row>
+<row><entry>s46-portparams</entry><entry>93</entry><entry>record(uint8, psid)</entry><entry>false</entry></row>
 <row><entry>s46-cont-mape</entry><entry>94</entry><entry>empty</entry><entry>false</entry></row>
 <row><entry>s46-cont-mapt</entry><entry>95</entry><entry>empty</entry><entry>false</entry></row>
 <row><entry>s46-cont-lw</entry><entry>96</entry><entry>empty</entry><entry>false</entry></row>
@@ -1124,6 +1144,9 @@ temporarily override a list of interface names and listen on all interfaces.
         </section>
         <section>
             <title>S46 BR</title>
+            <para>
+                @todo: Description
+            </para>
 <screen>
 {
     "code": 90,
@@ -1135,10 +1158,22 @@ temporarily override a list of interface names and listen on all interfaces.
 </screen>
         </section>
         <section>
-            <title>S46 DMR. No config required. Config example? TODO</title>
+            <title>S46 DMR. No config required</title>
+            <para>
+                    @todo: Description
+            </para>
+<screen>
+    @todo: Configuration example
+</screen>
         </section>
         <section>
-            <title>S46 IPv4/IPv6 Address Binding. Config example? TODO</title>
+            <title>S46 IPv4/IPv6 Address Binding</title>
+            <para>
+                    @todo: Description
+            </para>
+<screen>
+    @todo: Configuration example
+</screen>
         </section>
         <section>
             <title>S46 Port Parameters</title>
@@ -1177,16 +1212,28 @@ temporarily override a list of interface names and listen on all interfaces.
                 domain.
             </para>
         <section>
-            <title>S46 MAP-E container. Config example? TODO</title>
+            <title>S46 MAP-E container</title>
+            <para>
+                    @todo: Description
+            </para>
+<screen>
+    @todo: Configuration example
+</screen>
         </section>
         <section>
-            <title>S46 MAP-T container. Config example? TODO</title>
+            <title>S46 MAP-T container</title>
             <para>
-                MAP-T groups rules and optional ports.
+                    @todo: Description
             </para>
+<screen>
+    @todo: Configuration example
+</screen>
         </section>
         <section>
             <title>S46 Lightweight 4over6 container</title>
+	    <para>
+                @todo: Description
+            </para>
 <screen>
 {
     "code": 96,
@@ -2350,8 +2397,8 @@ should include options from the isc option space:
         "pd-pools": [
             {
                 "prefix": "2001:db8:1:8000::",
-                "prefix-len": 56,
-                "delegated-len": 64
+                "prefix-len": 48,
+                "delegated-len": 64,
             }
         ],
         <userinput>"reservations": [