merge in trac3429

handled conflicts (keactl to keactrl)

Conflicts:
	doc/guide/ddns.xml

diff --cc doc/guide/ddns.xml
index d88257ea257a267018edf725a7ac077f48a8a472,7c5994e834648f66f9006734adfce881b5f7f1ea..ffe34ba37987f542ea118486b6d0036fb9bb32b1
--- 1/doc/guide/ddns.xml
--- 2/doc/guide/ddns.xml
+++ b/doc/guide/ddns.xml
@@@ -56,43 -56,11 +56,43 @@@
        and, due to the nature of DDNS, it is run alongside either the
        DHCPv4 or DHCPv6 components (or both).  Like other parts of
        Kea, is a separate binary that can be run on its own or through
-       <command>keactl</command> (see <xref linkend="keactrl"/>). In
+       <command>keactrl</command> (see <xref linkend="keactrl"/>). In
        normal operation, controlling <command>kea-dhcp-ddns</command>
-       with <command>keactl</command> is recommended. However, it is also
 -      with <command>keactrl</command> is recommended.
++      with <command>keactrl</command> is recommended. However, it is also
 +      possible to run the DHCP-DDNS server directly. It accepts the
 +      following command-line switches:
        </para>
  
 +      <itemizedlist>
 +          <listitem>
 +            <simpara>
 +            <command>-c <replaceable>file</replaceable></command> -
 +            specifies the configuration file. This is the only mandatory
 +            switch.</simpara>
 +          </listitem>
 +          <listitem>
 +            <simpara>
 +            <command>-d</command> - specifies whether the server
 +            logging should be switched to debug/verbose mode. In verbose mode,
 +            the logging severity and debuglevel specified in a configuration
 +            file are ignored and "debug" severity and the maximum debuglevel
 +            (99) are assumed. The flag is convenient, for temporarily
 +            switching the server into maximum verbosity, e.g. when
 +            debugging.</simpara>
 +          </listitem>
 +          <listitem>
 +            <simpara>
 +              <command>-v</command> - prints out Kea version and exits.
 +            </simpara>
 +          </listitem>
 +          <listitem>
 +            <simpara>
 +              <command>-V</command> - prints out Kea extended version with
 +              additional parameters and exits.
 +            </simpara>
 +          </listitem>
 +      </itemizedlist>
 +
        <para>
        Upon start up the module will load its configuration and begin listening
        for NCRs based on that configuration.

diff --cc doc/guide/dhcp4-srv.xml
Simple merge

diff --cc doc/guide/dhcp6-srv.xml
Simple merge