From: Andrej Zverev <andrej.zverev@gmail.com>
Date: Fri, 17 Jun 2016 09:40:52 +0000 (+0300)
Subject: [Doc] Accent about `command options` help
X-Git-Tag: 1.3.0~305^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc887dbaff7233ef9ac6ca430aebecc550948dac;p=thirdparty%2Frspamd.git

[Doc] Accent about `command options` help
[Minor] Correct rspamadm -v to display actual version intead of help
---

diff --git a/doc/rspamadm.1.md b/doc/rspamadm.1.md
index 17bfa94c30..efe091da83 100644
--- a/doc/rspamadm.1.md
+++ b/doc/rspamadm.1.md
@@ -8,22 +8,20 @@ rspamadm - rspamd administration utility
 
 rspamadm [*global_options*] [*command*] [*command_options*]...
 
-rspamadm -l
-
-rspamadm help
-
-rspamadm help <command>
-
-rspamadm --help
-
 # DESCRIPTION
 
 `rspamadm` is a routine to manage rspamd spam filtering system. It is intended to perform
 such actions as merging databases, performing configuration tests, encrypting passwords,
-signing configurations and so on. You can get a list of available commands by running
+signing configurations and so on. You can get a list of available **commands** by running
 
     rspamadm -l
 
+Also for each command you can check list of available **command_options** by running
+
+    rspamadm help command
+    rspamadm command --help
+    
+
 # OPTIONS
 
 -h, \--help
diff --git a/src/rspamadm/rspamadm.c b/src/rspamadm/rspamadm.c
index b1cda55da6..523011a644 100644
--- a/src/rspamadm/rspamadm.c
+++ b/src/rspamadm/rspamadm.c
@@ -56,7 +56,7 @@ static GOptionEntry entries[] = {
 			"Redefine UCL variable", NULL},
 	{"help", 'h', 0, G_OPTION_ARG_NONE, &show_help,
 			"Show help", NULL},
-	{"version", 'h', 0, G_OPTION_ARG_NONE, &show_version,
+	{"version", 'v', 0, G_OPTION_ARG_NONE, &show_version,
 			"Show version", NULL},
 	{NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}
 };