From 57590d1e73df232bcc340df202cb718979ce6bd0 Mon Sep 17 00:00:00 2001
From: Tomek Mrugalski <tomasz@isc.org>
Date: Wed, 8 Aug 2018 15:08:43 +0200
Subject: [PATCH] [gitlab9] Changes after review:

 - man pages updated
 - kea-admin help updated slightly.
---
 src/bin/admin/kea-admin.in  |  2 +-
 src/bin/admin/kea-admin.xml | 10 ++++++++++
 src/bin/keactrl/keactrl.xml | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 024455ac36..30c0fcd628 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -66,7 +66,7 @@ usage() {
     printf " -p or --password pass - specifies a password when connecting to a database\n"
     printf " -n or --name database - specifies a database name to connect to\n"
     printf " -d or --directory - path to upgrade scripts (default: ${SCRIPTS_DIR_DEFAULT})\n"
-    printf " -v - print kea-admin version and quit.\n"
+    printf " -v or --version - print kea-admin version and quit.\n"
     printf "\n"
     printf " Parameters specific to lease-dump:\n"
     printf "     -4 to dump IPv4 leases to file\n"
diff --git a/src/bin/admin/kea-admin.xml b/src/bin/admin/kea-admin.xml
index 3d69c63d48..a4b126cdb4 100644
--- a/src/bin/admin/kea-admin.xml
+++ b/src/bin/admin/kea-admin.xml
@@ -50,6 +50,7 @@
       <arg choice="opt" rep="norepeat"><option>-d <replaceable class="parameter">scripts directory</replaceable></option></arg>
       <arg choice="opt" rep="norepeat"><option>-4 | -6</option></arg>
       <arg choice="opt" rep="norepeat"><option>-o <replaceable class="parameter">output file</replaceable></option></arg>
+      <arg choice="opt" rep="norepeat"><option>-v</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -173,6 +174,15 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-v|--version</option></term>
+        <listitem>
+          <para>
+            Prints kea-admin version and quits.
+          </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><option>-4</option></term>
         <listitem>
diff --git a/src/bin/keactrl/keactrl.xml b/src/bin/keactrl/keactrl.xml
index 24dd4850d5..8b20c41fe8 100644
--- a/src/bin/keactrl/keactrl.xml
+++ b/src/bin/keactrl/keactrl.xml
@@ -46,6 +46,7 @@
       <arg choice="opt" rep="norepeat">command</arg>
       <arg choice="opt" rep="norepeat"><option>-c <replaceable class="parameter">keactrl-config-file</replaceable></option></arg>
       <arg choice="opt" rep="norepeat"><option>-s <replaceable class="parameter">server[,server,...]</replaceable></option></arg>
+      <arg choice="opt" rep="norepeat"><option>-v</option></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
@@ -180,6 +181,15 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><option>-v|--version</option></term>
+        <listitem>
+          <para>
+            Prints keactrl version and quits.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </refsect1>
 
-- 
2.47.2