Reverse change of "show" to "list" and make several other commands more consistent with "category verb arguments"

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@47051 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 8 deletions

diff --git a/main/http.c b/main/http.c
index a60a27318..b778017ec 100644
--- a/main/http.c
+++ b/main/http.c
@@ -688,18 +688,13 @@ int ast_http_reload(void)
 }
 
 static char show_http_help[] =
-"Usage: http list status\n"
+"Usage: http show status\n"
 "       Lists status of internal HTTP engine\n";
 
-static struct ast_cli_entry cli_http_show_status_deprecated = {
-	{ "http", "show", "status", NULL },
-	handle_show_http, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_http[] = {
-	{ { "http", "list", "status", NULL },
+	{ { "http", "show", "status", NULL },
 	handle_show_http, "Display HTTP server status",
-	show_http_help, NULL, &cli_http_show_status_deprecated },
+	show_http_help },
 };
 
 int ast_http_init(void)