From: Jeremy C. Reed <jreed@isc.org>
Date: Tue, 12 Aug 2014 17:38:14 +0000 (+0000)
Subject: merge in trac3429
X-Git-Tag: trac3482_base~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ddbfb3d051e920bea21de3d20aa7dddcc82c772;p=thirdparty%2Fkea.git

merge in trac3429

handled conflicts (keactl to keactrl)

Conflicts:
	doc/guide/ddns.xml
---

4ddbfb3d051e920bea21de3d20aa7dddcc82c772
diff --cc doc/guide/ddns.xml
index d88257ea25,7c5994e834..ffe34ba379
--- a/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.