From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 11 Aug 2014 15:42:39 +0000 (+0200)
Subject: [3508] ARM updated.
X-Git-Tag: trac3482_base~46^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f9386bdef50e00adde2f8c5d642cec724e8160a;p=thirdparty%2Fkea.git

[3508] ARM updated.
---

diff --git a/ChangeLog b/ChangeLog
index 178d9b295c..b81a9a45e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+8xx.	[func]		tomek
+	DHCPv4,DHCPv6 and DDNS components now report their versions.
+	(Trac #3508, git tbd)
+
 815.	[func]		tomek
 	Pool definitions in DHCPv4 and DHCPv6 are now lists of
 	structures. This makes adding new per-pool parameters easier in
diff --git a/doc/guide/ddns.xml b/doc/guide/ddns.xml
index 67bf2c6767..854220b5fd 100644
--- a/doc/guide/ddns.xml
+++ b/doc/guide/ddns.xml
@@ -58,9 +58,41 @@
       Kea, is a separate binary that can be run on its own or through
       <command>keactl</command> (see <xref linkend="keactrl"/>). In
       normal operation, controlling <command>kea-dhcp-ddns</command>
-      with <command>keactl</command> is recommended.
+      with <command>keactl</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 exists.
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              <command>-V</command> - prints out Kea extended version with
+              additional parameters and exists.
+            </simpara>
+          </listitem>
+      </itemizedlist>
+
       <para>
       Upon start up the module will load its configuration and begin listening
       for NCRs based on that configuration.
diff --git a/doc/guide/dhcp4-srv.xml b/doc/guide/dhcp4-srv.xml
index 5e792e5fb2..0eb240a0b5 100644
--- a/doc/guide/dhcp4-srv.xml
+++ b/doc/guide/dhcp4-srv.xml
@@ -28,8 +28,8 @@
           </listitem>
           <listitem>
             <simpara>
-            <command>-v</command> - specifies whether the server
-            logging should be switched to verbose mode. In verbose mode,
+            <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
@@ -44,6 +44,17 @@
             ports other than default DHCPv4 ports will not be able to
             handle regular DHCPv4 queries.</simpara>
           </listitem>
+          <listitem>
+            <simpara>
+              <command>-v</command> - prints out Kea version and exists.
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              <command>-V</command> - prints out Kea extended version with
+              additional parameters and exists.
+            </simpara>
+          </listitem>
       </itemizedlist>
 
       <para>
diff --git a/doc/guide/dhcp6-srv.xml b/doc/guide/dhcp6-srv.xml
index bd4443c7f7..6a0afb82d9 100644
--- a/doc/guide/dhcp6-srv.xml
+++ b/doc/guide/dhcp6-srv.xml
@@ -42,6 +42,17 @@
             ports other than default DHCPv6 ports will not be able to
             handle regular DHCPv6 queries.</simpara>
           </listitem>
+          <listitem>
+            <simpara>
+              <command>-v</command> - prints out Kea version and exists.
+            </simpara>
+          </listitem>
+          <listitem>
+            <simpara>
+              <command>-V</command> - prints out Kea extended version with
+              additional parameters and exists.
+            </simpara>
+          </listitem>
       </itemizedlist>
 
       <para>