From bc887dbaff7233ef9ac6ca430aebecc550948dac Mon Sep 17 00:00:00 2001 From: Andrej Zverev Date: Fri, 17 Jun 2016 12:40:52 +0300 Subject: [PATCH] [Doc] Accent about `command options` help [Minor] Correct rspamadm -v to display actual version intead of help --- doc/rspamadm.1.md | 16 +++++++--------- src/rspamadm/rspamadm.c | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/doc/rspamadm.1.md b/doc/rspamadm.1.md index 17bfa94c3..efe091da8 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 - -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 b1cda55da..523011a64 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} };