[master] Merge branch 'trac3468' (Kea6, DDNS User's Guide update)

Conflicts:
	ChangeLog
	doc/guide/dhcp6-srv.xml

diff --cc ChangeLog
index 19fb7cdbf7711187ded14bbcecba883d1d45f793,e6f7117d77bb562f53d0570338d223d5c5b027a7..abdb65cdcdb0affe123b14101ff9d7e99d6d88ac
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,9 +1,41 @@@
 -8XX.  [doc]           tomek
++812.  [doc]           tomek
+       DHCPv6 and DDNS sections in Kea Administrator Reference Manual
+       has been updated. Usage of keactl has been documented.
 -      (Trac #3468, git abcd)
++      (Trac #3468, git 3945fc6211bcadb9bece7147039a6b50ebcf936b)
+       (Trac #3466, git fa9570d19c73cbe7effc75589b7eb855c411f6a3)
+ 
 +811.  [doc]           tmark
 +      Added documentation of message protocol between DHCP servers and the
 +      DHCP-DDNS process.
 +      (Trac #3505, git 6d9aed2f8fe181714e8260493c6cc06e13d0edd0)
 +
 +810.  [func]          stephen
 +      perfdhcp is now installed in sbin as it requires root privilege to run.
 +      The perfdhcp source has been moved to the directory src/bin/perfdhcp.
 +      (Trac #3481, git d101aed6156a993476fa1164f0b0ec8395f5886c)
 +
 +809.  [func]          stephen
 +      sockcreator is no longer built or installed.  The code is being retained
 +      in the repository for the moment, but may be deleted at some point in the
 +      future.
 +      (Trac #3480, git 2a55a469dde8fcc053b49e287c30d0906baa91b4)
 +
 +808.  [func]          stephen
 +      Reduced number of startup and shutdown messages in the
 +      DHCP-DDNS process by making some of them debug messages.
 +      (Trac #3479, git bca0bae285de9ce904c0afd21af777dac2edb4e6)
 +
 +807.  [func]          marcin
 +      DHCPv6 server responds to Confirm messages from clients.
 +      (Trac #3269, git 4f43c309a994e30c07f5aa27057552fb195ec284)
 +
 +806.  [func]          marcin
 +      DHCPv4 server processes Requested IP Address option (50).
 +      (Trac #3320, git ad411a177a32bbe6a93f4baf813d985558c99e2f)
 +
 +805.  [func]          stephen
 +      Changed all occurrences of "BIND 10" in message files to "Kea".
 +      (Trac #3416, git e88090b57a75424920d9b96efbf50e3554048828)
  
  804.  [func]          marcin
        DHCPv4 server supports DHCPINFORM messages from the clients.

diff --cc doc/guide/dhcp6-srv.xml
index 48e691d5b717962364545070700999ca9d228ff6,cbd64364c653d05a577d46784d3bfab826d90bfd..630afdaddf779ac693434cc97ccbbdc4d91210e7
--- 1/doc/guide/dhcp6-srv.xml
--- 2/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@@ -1508,20 -1807,22 +1807,22 @@@ should include options from the isc opt
          <listitem>
            <simpara>Temporary addresses are not supported.</simpara>
          </listitem>
+ 
          <listitem>
            <simpara>
 -            Duplication report (DECLINE),
 -            stateless configuration (INFORMATION-REQUEST) and client
 -            reconfiguration (RECONFIGURE) are not yet supported.
 +            Duplication report (DECLINE), stateless configuration
 +            (INFORMATION-REQUEST) and client reconfiguration (RECONFIGURE) are
 +            not yet supported.
            </simpara>
          </listitem>
-           <listitem>
-             <simpara>
-               The server doesn't act upon expired leases. In particular,
-               when a lease expires, the server doesn't request removal of
-               the DNS records associated with it.
-             </simpara>
-           </listitem>
+ 
+         <listitem>
+           <simpara>
+             The server doesn't act upon expired leases. In particular,
+             when a lease expires, the server doesn't request removal of
+             the DNS records associated with it.
+           </simpara>
+         </listitem>
        </itemizedlist>
      </section>