From 10875731ecfbe329b31be706d30a81dd579c3b56 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 2 Nov 2006 23:16:09 +0000 Subject: Merged revisions 47051 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r47051 | tilghman | 2006-11-02 17:00:20 -0600 (Thu, 02 Nov 2006) | 2 lines Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments" ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47052 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_agi.c | 6 +++--- res/res_crypto.c | 4 ++-- res/res_features.c | 2 +- res/res_indications.c | 4 ++-- res/res_musiconhold.c | 4 ++-- res/res_odbc.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) (limited to 'res') diff --git a/res/res_agi.c b/res/res_agi.c index 971db0b2f..57a034b33 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -95,7 +95,7 @@ static char *descrip = "variable to \"no\" before executing the AGI application.\n" " Using 'EAGI' provides enhanced AGI, with incoming audio available out of band\n" "on file descriptor 3\n\n" -" Use the CLI command 'agi list' to list available agi commands\n" +" Use the CLI command 'agi show' to list available agi commands\n" " This application sets the following channel variable upon completion:\n" " AGISTATUS The status of the attempt to the run the AGI script\n" " text string, one of SUCCESS | FAILED | HANGUP\n"; @@ -2085,7 +2085,7 @@ static int deadagi_exec(struct ast_channel *chan, void *data) } static char showagi_help[] = -"Usage: agi list [topic]\n" +"Usage: agi show [topic]\n" " When called with a topic as an argument, displays usage\n" " information on the given command. If called without a\n" " topic, it provides a list of AGI commands.\n"; @@ -2104,7 +2104,7 @@ static struct ast_cli_entry cli_agi[] = { agi_no_debug, "Disable AGI debugging", no_debug_usage }, - { { "agi", "list", NULL }, + { { "agi", "show", NULL }, handle_showagi, "List AGI commands or specific help", showagi_help }, diff --git a/res/res_crypto.c b/res/res_crypto.c index 055716789..b5035b1c5 100644 --- a/res/res_crypto.c +++ b/res/res_crypto.c @@ -556,7 +556,7 @@ static int init_keys(int fd, int argc, char *argv[]) } static char show_key_usage[] = -"Usage: keys list\n" +"Usage: keys show\n" " Displays information about RSA keys known by Asterisk\n"; static char init_keys_usage[] = @@ -564,7 +564,7 @@ static char init_keys_usage[] = " Initializes private keys (by reading in pass code from the user)\n"; static struct ast_cli_entry cli_crypto[] = { - { { "keys", "list", NULL }, + { { "keys", "show", NULL }, show_keys, "Displays RSA key information", show_key_usage }, diff --git a/res/res_features.c b/res/res_features.c index e48c2e00f..f8a1168e1 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1932,7 +1932,7 @@ static char showparked_help[] = " Lists currently parked calls.\n"; static struct ast_cli_entry cli_features[] = { - { { "feature", "list", NULL }, + { { "feature", "show", NULL }, handle_showfeatures, "Lists configured features", showfeatures_help }, diff --git a/res/res_indications.c b/res/res_indications.c index 25a0d4d7c..a4d8ae20e 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -64,7 +64,7 @@ static char help_remove_indication[] = " Remove the given indication from the country.\n"; static char help_show_indications[] = -"Usage: indication list [ ...]\n" +"Usage: indication show [ ...]\n" " Display either a condensed for of all country/indications, or the\n" " indications for the specified countries.\n"; @@ -354,7 +354,7 @@ static struct ast_cli_entry cli_indications[] = { handle_remove_indication, "Remove the given indication from the country", help_remove_indication, NULL }, - { { "indication", "list", NULL }, + { { "indication", "show", NULL }, handle_show_indications, "Display a list of all countries/indications", help_show_indications }, }; diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index 0902602b7..72afed5d7 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -1142,11 +1142,11 @@ static struct ast_cli_entry cli_moh[] = { moh_cli, "Music On Hold", "Music On Hold" }, - { { "moh", "list", "classes"}, + { { "moh", "show", "classes"}, moh_classes_show, "List MOH classes", "Lists all MOH classes" }, - { { "moh", "list", "files"}, + { { "moh", "show", "files"}, cli_files_show, "List MOH file-based classes", "Lists all loaded file-based MOH classes and their files" }, }; diff --git a/res/res_odbc.c b/res/res_odbc.c index e8f81ba4d..036b02151 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -338,12 +338,12 @@ static int odbc_show_command(int fd, int argc, char **argv) } static char show_usage[] = -"Usage: odbc list []\n" +"Usage: odbc show []\n" " List settings of a particular ODBC class.\n" " or, if not specified, all classes.\n"; static struct ast_cli_entry cli_odbc[] = { - { { "odbc", "list", NULL }, + { { "odbc", "show", NULL }, odbc_show_command, "List ODBC DSN(s)", show_usage }, }; -- cgit v1.2.3