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

7 files changed, 106 insertions, 249 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 92027fb5e..23ef874f1 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1721,11 +1721,11 @@ static int agents_show_online(int fd, int argc, char **argv)
 
 
 static char show_agents_usage[] = 
-"Usage: agent list\n"
+"Usage: agent show\n"
 "       Provides summary information on agents.\n";
 
 static char show_agents_online_usage[] =
-"Usage: agent list online\n"
+"Usage: agent show online\n"
 "	Provides a list of all online agents.\n";
 
 static char agent_logoff_usage[] =
@@ -1744,11 +1744,11 @@ static struct ast_cli_entry cli_show_agents_online_deprecated = {
 	NULL, NULL };
 
 static struct ast_cli_entry cli_agents[] = {
-	{ { "agent", "list", NULL },
+	{ { "agent", "show", NULL },
 	agents_show, "Show status of agents",
 	show_agents_usage, NULL, &cli_show_agents_deprecated },
 
-	{ { "agent", "list", "online" },
+	{ { "agent", "show", "online" },
 	agents_show_online, "Show all online agents",
 	show_agents_online_usage, NULL, &cli_show_agents_online_deprecated },
 
diff --git a/channels/chan_features.c b/channels/chan_features.c
index 0f239ce4b..4e3d8ec31 100644
--- a/channels/chan_features.c
+++ b/channels/chan_features.c
@@ -530,18 +530,13 @@ static int features_show(int fd, int argc, char **argv)
 }
 
 static char show_features_usage[] = 
-"Usage: feature list channels\n"
+"Usage: feature show channels\n"
 "       Provides summary information on feature channels.\n";
 
-static struct ast_cli_entry cli_features_show_channels_deprecated = {
-	{ "feature", "show", "channels", NULL },
-	features_show, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_features[] = {
-	{ { "feature", "list", "channels", NULL },
+	{ { "feature", "show", "channels", NULL },
 	features_show, "List status of feature channels",
-	show_features_usage, NULL, &cli_features_show_channels_deprecated },
+	show_features_usage },
 };
 
 static int load_module(void)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 642dd6d61..5bb88d9b2 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4424,55 +4424,27 @@ static int iax2_do_jb_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int iax2_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	iaxdebug = 0;
-	ast_cli(fd, "IAX2 Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int iax2_no_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 2)
+	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 	iaxdebug = 0;
 	ast_cli(fd, "IAX2 Debugging Disabled\n");
 	return RESULT_SUCCESS;
 }
 
-static int iax2_no_trunk_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 4)
-		return RESULT_SHOWUSAGE;
-	iaxtrunkdebug = 0;
-	ast_cli(fd, "IAX2 Trunk Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int iax2_no_trunk_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 3)
+	if (argc != 4)
 		return RESULT_SHOWUSAGE;
 	iaxtrunkdebug = 0;
 	ast_cli(fd, "IAX2 Trunk Debugging Disabled\n");
 	return RESULT_SUCCESS;
 }
 
-static int iax2_no_jb_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 4)
-		return RESULT_SHOWUSAGE;
-	jb_setoutput(jb_error_output, jb_warning_output, NULL);
-	jb_debug_output("\n");
-	ast_cli(fd, "IAX2 Jitterbuffer Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int iax2_no_jb_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 3)
+	if (argc != 4)
 		return RESULT_SHOWUSAGE;
 	jb_setoutput(jb_error_output, jb_warning_output, NULL);
 	jb_debug_output("\n");
@@ -9637,11 +9609,11 @@ static struct ast_switch iax2_switch =
 };
 
 static char show_stats_usage[] =
-"Usage: iax2 list stats\n"
+"Usage: iax2 show stats\n"
 "       Display statistics on IAX channel driver.\n";
 
 static char show_cache_usage[] =
-"Usage: iax2 list cache\n"
+"Usage: iax2 show cache\n"
 "       Display currently cached IAX Dialplan results.\n";
 
 static char show_peer_usage[] =
@@ -9664,34 +9636,34 @@ static char show_prov_usage[] =
 "       fields will be provisioned as empty fields.\n";
 
 static char show_users_usage[] = 
-"Usage: iax2 list users [like <pattern>]\n"
+"Usage: iax2 show users [like <pattern>]\n"
 "       Lists all known IAX2 users.\n"
 "       Optional regular expression pattern is used to filter the user list.\n";
 
 static char show_channels_usage[] = 
-"Usage: iax2 list channels\n"
+"Usage: iax2 show channels\n"
 "       Lists all currently active IAX channels.\n";
 
 static char show_netstats_usage[] = 
-"Usage: iax2 list netstats\n"
+"Usage: iax2 show netstats\n"
 "       Lists network status for all currently active IAX channels.\n";
 
 static char show_threads_usage[] = 
-"Usage: iax2 list threads\n"
+"Usage: iax2 show threads\n"
 "       Lists status of IAX helper threads\n";
 
 static char show_peers_usage[] = 
-"Usage: iax2 list peers [registered] [like <pattern>]\n"
+"Usage: iax2 show peers [registered] [like <pattern>]\n"
 "       Lists all known IAX2 peers.\n"
 "       Optional 'registered' argument lists only peers with known addresses.\n"
 "       Optional regular expression pattern is used to filter the peer list.\n";
 
 static char show_firmware_usage[] = 
-"Usage: iax2 list firmware\n"
+"Usage: iax2 show firmware\n"
 "       Lists all known IAX firmware images.\n";
 
 static char show_reg_usage[] =
-"Usage: iax2 list registry\n"
+"Usage: iax2 show registry\n"
 "       Lists all registration requests and status.\n";
 
 static char debug_usage[] = 
@@ -9748,17 +9720,17 @@ static struct ast_cli_entry cli_iax2_jb_debug_deprecated = {
 
 static struct ast_cli_entry cli_iax2_no_debug_deprecated = {
 	{ "iax2", "no", "debug", NULL },
-	iax2_no_debug_deprecated, NULL,
+	iax2_no_debug, NULL,
 	NULL };
 
 static struct ast_cli_entry cli_iax2_no_trunk_debug_deprecated = {
 	{ "iax2", "no", "trunk", "debug", NULL },
-	iax2_no_trunk_debug_deprecated, NULL,
+	iax2_no_trunk_debug, NULL,
 	NULL };
 
 static struct ast_cli_entry cli_iax2_no_jb_debug_deprecated = {
 	{ "iax2", "no", "jb", "debug", NULL },
-	iax2_no_jb_debug_deprecated, NULL,
+	iax2_no_jb_debug, NULL,
 	NULL };
 
 static struct ast_cli_entry cli_iax2_show_cache_deprecated = {
@@ -9806,39 +9778,39 @@ static struct ast_cli_entry cli_iax2_show_registry_deprecated = {
 	show_reg_usage };
 
 static struct ast_cli_entry cli_iax2[] = {
-	{ { "iax2", "list", "cache", NULL },
+	{ { "iax2", "show", "cache", NULL },
 	iax2_show_cache, "Display IAX cached dialplan",
 	show_cache_usage, NULL, &cli_iax2_show_cache_deprecated  },
 
-	{ { "iax2", "list", "channels", NULL },
+	{ { "iax2", "show", "channels", NULL },
 	iax2_show_channels, "List active IAX channels",
 	show_channels_usage, NULL, &cli_iax2_show_channels_deprecated  },
 
-	{ { "iax2", "list", "firmware", NULL },
+	{ { "iax2", "show", "firmware", NULL },
 	iax2_show_firmware, "List available IAX firmwares",
 	show_firmware_usage, NULL, &cli_iax2_show_firmware_deprecated  },
 
-	{ { "iax2", "list", "netstats", NULL },
+	{ { "iax2", "show", "netstats", NULL },
 	iax2_show_netstats, "List active IAX channel netstats",
 	show_netstats_usage, NULL, &cli_iax2_show_netstats_deprecated  },
 
-	{ { "iax2", "list", "peers", NULL },
+	{ { "iax2", "show", "peers", NULL },
 	iax2_show_peers, "List defined IAX peers",
 	show_peers_usage, NULL, &cli_iax2_show_peers_deprecated  },
 
-	{ { "iax2", "list", "registry", NULL },
+	{ { "iax2", "show", "registry", NULL },
 	iax2_show_registry, "Display IAX registration status",
 	show_reg_usage, NULL, &cli_iax2_show_registry_deprecated  },
 
-	{ { "iax2", "list", "stats", NULL },
+	{ { "iax2", "show", "stats", NULL },
 	iax2_show_stats, "Display IAX statistics",
 	show_stats_usage, NULL, &cli_iax2_show_stats_deprecated },
 
-	{ { "iax2", "list", "threads", NULL },
+	{ { "iax2", "show", "threads", NULL },
 	iax2_show_threads, "Display IAX helper thread info",
 	show_threads_usage, NULL, &cli_iax2_show_threads_deprecated  },
 
-	{ { "iax2", "list", "users", NULL },
+	{ { "iax2", "show", "users", NULL },
 	iax2_show_users, "List defined IAX users",
 	show_users_usage, NULL, &cli_iax2_show_users_deprecated  },
 
@@ -9866,15 +9838,15 @@ static struct ast_cli_entry cli_iax2[] = {
 	iax2_do_jb_debug, "Enable IAX jitterbuffer debugging",
 	debug_jb_usage, NULL, &cli_iax2_jb_debug_deprecated },
 
-	{ { "iax2", "nodebug", NULL },
+	{ { "iax2", "debug", "off", NULL },
 	iax2_no_debug, "Disable IAX debugging",
 	no_debug_usage, NULL, &cli_iax2_no_debug_deprecated },
 
-	{ { "iax2", "nodebug", "trunk", NULL },
+	{ { "iax2", "debug", "trunk", "off", NULL },
 	iax2_no_trunk_debug, "Disable IAX trunk debugging",
 	no_debug_trunk_usage, NULL, &cli_iax2_no_trunk_debug_deprecated },
 
-	{ { "iax2", "nodebug", "jb", NULL },
+	{ { "iax2", "debug", "jb", "off", NULL },
 	iax2_no_jb_debug, "Disable IAX jitterbuffer debugging",
 	no_debug_jb_usage, NULL, &cli_iax2_no_jb_debug_deprecated },
 
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 9896f0f1d..863820586 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -626,18 +626,13 @@ static int locals_show(int fd, int argc, char **argv)
 }
 
 static char show_locals_usage[] = 
-"Usage: local list channels\n"
+"Usage: local show channels\n"
 "       Provides summary information on active local proxy channels.\n";
 
-static struct ast_cli_entry cli_local_show_channels_deprecated = {
-	{ "local", "show", "channels", NULL },
-	locals_show, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_local[] = {
-	{ { "local", "list", "channels", NULL },
+	{ { "local", "show", "channels", NULL },
 	locals_show, "List status of local channels",
-	show_locals_usage, NULL, &cli_local_show_channels_deprecated },
+	show_locals_usage },
 };
 
 /*! \brief Load module into PBX, register channel */
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 778fd4ca7..9c7c26e13 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -1040,11 +1040,11 @@ static int mgcp_show_endpoints(int fd, int argc, char *argv[])
 }
 
 static char show_endpoints_usage[] = 
-"Usage: mgcp endpoint list\n"
+"Usage: mgcp show endpoints\n"
 "       Lists all endpoints known to the MGCP (Media Gateway Control Protocol) subsystem.\n";
 
 static char audit_endpoint_usage[] = 
-"Usage: mgcp endpoint audit <endpointid>\n"
+"Usage: mgcp audit endpoint <endpointid>\n"
 "       Lists the capabilities of an endpoint in the MGCP (Media Gateway Control Protocol) subsystem.\n"
 "       mgcp debug MUST be on to see the results of this command.\n";
 
@@ -1053,12 +1053,13 @@ static char debug_usage[] =
 "       Enables dumping of MGCP packets for debugging purposes\n";
 
 static char no_debug_usage[] = 
-"Usage: mgcp nodebug\n"
+"Usage: mgcp debug off\n"
 "       Disables dumping of MGCP packets for debugging purposes\n";
 
 static char mgcp_reload_usage[] =
 "Usage: mgcp reload\n"
-"       Reloads MGCP configuration from mgcp.conf\n";
+"       Reloads MGCP configuration from mgcp.conf\n"
+"       Deprecated:  please use 'reload chan_mgcp.so' instead.\n";
 
 static int mgcp_audit_endpoint(int fd, int argc, char *argv[])
 {
@@ -1122,55 +1123,31 @@ static int mgcp_do_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int mgcp_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	mgcpdebug = 0;
-	ast_cli(fd, "MGCP Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int mgcp_no_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 2)
+	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 	mgcpdebug = 0;
 	ast_cli(fd, "MGCP Debugging Disabled\n");
 	return RESULT_SUCCESS;
 }
 
-static struct ast_cli_entry cli_mgcp_no_debug_deprecated = {
-	{ "mgcp", "no", "debug", NULL },
-	mgcp_no_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_mgcp_audit_endpoint_deprecated = {
-	{ "mgcp", "audit", "endpoint", NULL },
-	mgcp_audit_endpoint, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_mgcp_show_endpoints_deprecated = {
-	{ "mgcp", "show", "endpoints", NULL },
-	mgcp_show_endpoints, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_mgcp[] = {
-	{ { "mgcp", "endpoint", "audit", NULL },
+	{ { "mgcp", "audit", "endpoint", NULL },
 	mgcp_audit_endpoint, "Audit specified MGCP endpoint",
-	audit_endpoint_usage, NULL, &cli_mgcp_audit_endpoint_deprecated },
+	audit_endpoint_usage },
 
-	{ { "mgcp", "endpoint", "list", NULL },
+	{ { "mgcp", "show", "endpoints", NULL },
 	mgcp_show_endpoints, "List defined MGCP endpoints",
-	show_endpoints_usage, NULL, &cli_mgcp_show_endpoints_deprecated },
+	show_endpoints_usage },
 
 	{ { "mgcp", "debug", NULL },
 	mgcp_do_debug, "Enable MGCP debugging",
 	debug_usage },
 
-	{ { "mgcp", "nodebug", NULL },
+	{ { "mgcp", "debug", "off", NULL },
 	mgcp_no_debug, "Disable MGCP debugging",
-	no_debug_usage, NULL, &cli_mgcp_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "mgcp", "reload", NULL },
 	mgcp_reload, "Reload MGCP configuration",
@@ -4305,6 +4282,12 @@ static int mgcp_do_reload(void)
 
 static int mgcp_reload(int fd, int argc, char *argv[])
 {
+	static int deprecated = 0;
+	if (!deprecated && argc > 0) {
+		ast_log(LOG_WARNING, "'mgcp reload' is deprecated.  Please use 'reload chan_mgcp.so' instead.\n");
+		deprecated = 1;
+	}
+
 	ast_mutex_lock(&mgcp_reload_lock);
 	if (mgcp_reloading) {
 		ast_verbose("Previous mgcp reload not yet done\n");
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 99f9e87aa..3477d9d96 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10757,18 +10757,9 @@ static int sip_notify(int fd, int argc, char *argv[])
 }
 
 /*! \brief Disable SIP Debugging in CLI */
-static int sip_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-	ast_clear_flag(&global_flags[1], SIP_PAGE2_DEBUG_CONSOLE);
-	ast_cli(fd, "SIP Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int sip_no_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 2)
+	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 	ast_clear_flag(&global_flags[1], SIP_PAGE2_DEBUG_CONSOLE);
 	ast_cli(fd, "SIP Debugging Disabled\n");
@@ -10787,19 +10778,9 @@ static int sip_do_history(int fd, int argc, char *argv[])
 }
 
 /*! \brief Disable SIP History logging (CLI) */
-static int sip_no_history_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3) {
-		return RESULT_SHOWUSAGE;
-	}
-	recordhistory = FALSE;
-	ast_cli(fd, "SIP History Recording Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int sip_no_history(int fd, int argc, char *argv[])
 {
-	if (argc != 2) {
+	if (argc != 3) {
 		return RESULT_SHOWUSAGE;
 	}
 	recordhistory = FALSE;
@@ -10995,7 +10976,7 @@ static int build_reply_digest(struct sip_pvt *p, int method, char* digest, int d
 }
 	
 static char show_domains_usage[] = 
-"Usage: sip list domains\n"
+"Usage: sip show domains\n"
 "       Lists all configured SIP local domains.\n"
 "       Asterisk only responds to SIP messages to local domains.\n";
 
@@ -11005,7 +10986,7 @@ static char notify_usage[] =
 "       Message types are defined in sip_notify.conf\n";
 
 static char show_users_usage[] = 
-"Usage: sip list users [like <pattern>]\n"
+"Usage: sip show users [like <pattern>]\n"
 "       Lists all known SIP users.\n"
 "       Optional regular expression pattern is used to filter the user list.\n";
 
@@ -11015,12 +10996,12 @@ static char show_user_usage[] =
 "       Option \"load\" forces lookup of peer in realtime storage.\n";
 
 static char show_inuse_usage[] = 
-"Usage: sip list inuse [all]\n"
+"Usage: sip show inuse [all]\n"
 "       List all SIP users and peers usage counters and limits.\n"
 "       Add option \"all\" to show all devices, not only those with a limit.\n";
 
 static char show_channels_usage[] = 
-"Usage: sip list channels\n"
+"Usage: sip show channels\n"
 "       Lists all currently active SIP channels.\n";
 
 static char show_channel_usage[] = 
@@ -11032,7 +11013,7 @@ static char show_history_usage[] =
 "       Provides detailed dialog history on a given SIP channel.\n";
 
 static char show_peers_usage[] = 
-"Usage: sip list peers [like <pattern>]\n"
+"Usage: sip show peers [like <pattern>]\n"
 "       Lists all known SIP peers.\n"
 "       Optional regular expression pattern is used to filter the peer list.\n";
 
@@ -11047,7 +11028,7 @@ static char prune_realtime_usage[] =
 "       Optional regular expression pattern is used to filter the objects.\n";
 
 static char show_reg_usage[] =
-"Usage: sip list registry\n"
+"Usage: sip show registry\n"
 "       Lists all registration requests and status.\n";
 
 static char debug_usage[] = 
@@ -11060,11 +11041,11 @@ static char debug_usage[] =
 "       Require peer to be registered.\n";
 
 static char no_debug_usage[] = 
-"Usage: sip nodebug\n"
+"Usage: sip debug off\n"
 "       Disables dumping of SIP packets for debugging purposes\n";
 
 static char no_history_usage[] = 
-"Usage: sip nohistory\n"
+"Usage: sip history off\n"
 "       Disables recording of SIP dialog history for debugging purposes\n";
 
 static char history_usage[] = 
@@ -11074,18 +11055,19 @@ static char history_usage[] =
 
 static char sip_reload_usage[] =
 "Usage: sip reload\n"
-"       Reloads SIP configuration from sip.conf\n";
+"       Reloads SIP configuration from sip.conf\n"
+"       Deprecated:  please use 'reload chan_sip.so'\n";
 
 static char show_subscriptions_usage[] =
-"Usage: sip list subscriptions\n" 
+"Usage: sip show subscriptions\n" 
 "       Lists active SIP subscriptions for extension states\n";
 
 static char show_objects_usage[] =
-"Usage: sip list objects\n" 
+"Usage: sip show objects\n" 
 "       Lists status of known SIP objects\n";
 
 static char show_settings_usage[] = 
-"Usage: sip list settings\n"
+"Usage: sip show settings\n"
 "       Provides detailed list of the configuration of the SIP channel.\n";
 
 /*! \brief Read SIP header (dialplan function) */
@@ -16799,6 +16781,11 @@ static int sip_do_reload(enum channelreloadreason reason)
 /*! \brief Force reload of module from cli */
 static int sip_reload(int fd, int argc, char *argv[])
 {
+	static int deprecated = 0;
+	if (!deprecated && argc > 0) {
+		ast_log(LOG_WARNING, "\"sip reload\" is deprecated.  Please use 'reload chan_sip.so' instead.\n");
+		deprecated = 1;
+	}
 
 	ast_mutex_lock(&sip_reload_lock);
 	if (sip_reloading) 
@@ -16822,92 +16809,42 @@ static int reload(void)
 	return sip_reload(0, 0, NULL);
 }
 
-static struct ast_cli_entry cli_sip_no_history_deprecated = {
-	{ "sip", "no", "history", NULL },
-	sip_no_history_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_sip_no_debug_deprecated = {
-	{ "sip", "no", "debug", NULL },
-	sip_no_debug_deprecated, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_sip_show_objects_deprecated = {
-	{ "sip", "show", "objects", NULL },
-	sip_show_objects, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_users_deprecated = {
-	{ "sip", "show", "users", NULL },
-	sip_show_users, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_subscriptions_deprecated = {
-	{ "sip", "show", "subscriptions", NULL },
-	sip_show_subscriptions, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_channels_deprecated = {
-	{ "sip", "show", "channels", NULL },
-	sip_show_channels, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_sip_show_domains_deprecated = {
-	{ "sip", "show", "domains", NULL },
-	sip_show_domains, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_peers_deprecated = {
-	{ "sip", "show", "peers", NULL },
-	sip_show_peers, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_inuse_deprecated = {
-	{ "sip", "show", "inuse", NULL },
-	sip_show_inuse, NULL,
-        NULL };
-
-static struct ast_cli_entry cli_sip_show_registry_deprecated = {
-	{ "sip", "show", "registry", NULL },
-	sip_show_registry, NULL,
-        NULL };
-
 static struct ast_cli_entry cli_sip[] = {
-	{ { "sip", "list", "channels", NULL },
+	{ { "sip", "show", "channels", NULL },
 	sip_show_channels, "List active SIP channels",
-	show_channels_usage, NULL, &cli_sip_show_channels_deprecated },
+	show_channels_usage },
 
-	{ { "sip", "list", "domains", NULL },
+	{ { "sip", "show", "domains", NULL },
 	sip_show_domains, "List our local SIP domains.",
-	show_domains_usage, NULL, &cli_sip_show_domains_deprecated },
+	show_domains_usage },
 
-	{ { "sip", "list", "inuse", NULL },
+	{ { "sip", "show", "inuse", NULL },
 	sip_show_inuse, "List all inuse/limits",
-	show_inuse_usage, NULL, &cli_sip_show_inuse_deprecated },
+	show_inuse_usage },
 
-	{ { "sip", "list", "objects", NULL },
+	{ { "sip", "show", "objects", NULL },
 	sip_show_objects, "List all SIP object allocations",
-	show_objects_usage, NULL, &cli_sip_show_objects_deprecated },
+	show_objects_usage },
 
-	{ { "sip", "list", "peers", NULL },
+	{ { "sip", "show", "peers", NULL },
 	sip_show_peers, "List defined SIP peers",
-	show_peers_usage, NULL, &cli_sip_show_peers_deprecated },
+	show_peers_usage },
 
-	{ { "sip", "list", "registry", NULL },
+	{ { "sip", "show", "registry", NULL },
 	sip_show_registry, "List SIP registration status",
-	show_reg_usage, NULL, &cli_sip_show_registry_deprecated },
+	show_reg_usage },
 
 	{ { "sip", "show", "settings", NULL },
 	sip_show_settings, "Show SIP global settings",
-	show_settings_usage, NULL, NULL},
+	show_settings_usage },
 
-	{ { "sip", "list", "subscriptions", NULL },
+	{ { "sip", "show", "subscriptions", NULL },
 	sip_show_subscriptions, "List active SIP subscriptions",
-	show_subscriptions_usage, NULL, &cli_sip_show_subscriptions_deprecated },
+	show_subscriptions_usage },
 
-	{ { "sip", "list", "users", NULL },
+	{ { "sip", "show", "users", NULL },
 	sip_show_users, "List defined SIP users",
-	show_users_usage, NULL, &cli_sip_show_users_deprecated },
+	show_users_usage },
 
 	{ { "sip", "notify", NULL },
 	sip_notify, "Send a notify packet to a SIP peer",
@@ -16953,17 +16890,17 @@ static struct ast_cli_entry cli_sip[] = {
 	sip_do_debug, "Enable SIP debugging on Peername",
 	debug_usage, complete_sip_debug_peer },
 
-	{ { "sip", "nodebug", NULL },
+	{ { "sip", "debug", "off", NULL },
 	sip_no_debug, "Disable SIP debugging",
-	no_debug_usage, NULL, &cli_sip_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "sip", "history", NULL },
 	sip_do_history, "Enable SIP history",
 	history_usage },
 
-	{ { "sip", "nohistory", NULL },
+	{ { "sip", "history", "off", NULL },
 	sip_no_history, "Disable SIP history",
-	no_history_usage, NULL, &cli_sip_no_history_deprecated },
+	no_history_usage },
 
 	{ { "sip", "reload", NULL },
 	sip_reload, "Reload SIP configuration",
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index ae32ebf7b..f4890e18a 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -1758,19 +1758,9 @@ static int skinny_do_debug(int fd, int argc, char *argv[])
 	return RESULT_SUCCESS;
 }
 
-static int skinny_no_debug_deprecated(int fd, int argc, char *argv[])
-{
-	if (argc != 3) {
-		return RESULT_SHOWUSAGE;
-	}
-	skinnydebug = 0;
-	ast_cli(fd, "Skinny Debugging Disabled\n");
-	return RESULT_SUCCESS;
-}
-
 static int skinny_no_debug(int fd, int argc, char *argv[])
 {
-	if (argc != 2) {
+	if (argc != 3) {
 		return RESULT_SHOWUSAGE;
 	}
 	skinnydebug = 0;
@@ -1959,11 +1949,11 @@ static int skinny_show_lines(int fd, int argc, char *argv[])
 }
 
 static char show_devices_usage[] =
-"Usage: skinny list devices\n"
+"Usage: skinny show devices\n"
 "       Lists all devices known to the Skinny subsystem.\n";
 
 static char show_lines_usage[] =
-"Usage: skinny list lines\n"
+"Usage: skinny show lines\n"
 "       Lists all lines known to the Skinny subsystem.\n";
 
 static char debug_usage[] =
@@ -1971,44 +1961,29 @@ static char debug_usage[] =
 "       Enables dumping of Skinny packets for debugging purposes\n";
 
 static char no_debug_usage[] =
-"Usage: skinny nodebug\n"
+"Usage: skinny no debug\n"
 "       Disables dumping of Skinny packets for debugging purposes\n";
 
 static char reset_usage[] =
 "Usage: skinny reset <DeviceId|all> [restart]\n"
 "       Causes a Skinny device to reset itself, optionally with a full restart\n";
 
-static struct ast_cli_entry cli_skinny_show_devices_deprecated = {
-	{ "skinny", "show", "devices", NULL },
-	skinny_show_devices, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_skinny_show_lines_deprecated = {
-	{ "skinny", "show", "lines", NULL },
-	skinny_show_lines, NULL,
-	NULL };
-
-static struct ast_cli_entry cli_skinny_no_debug_deprecated = {
-	{ "skinny", "no", "debug", NULL },
-	skinny_no_debug_deprecated, NULL,
-	NULL };
-
 static struct ast_cli_entry cli_skinny[] = {
-	{ { "skinny", "list", "devices", NULL },
+	{ { "skinny", "show", "devices", NULL },
 	skinny_show_devices, "List defined Skinny devices",
-	show_devices_usage, NULL, &cli_skinny_show_devices_deprecated },
+	show_devices_usage },
 
-	{ { "skinny", "list", "lines", NULL },
+	{ { "skinny", "show", "lines", NULL },
 	skinny_show_lines, "List defined Skinny lines per device",
-	show_lines_usage, NULL, &cli_skinny_show_lines_deprecated },
+	show_lines_usage },
 
 	{ { "skinny", "debug", NULL },
 	skinny_do_debug, "Enable Skinny debugging",
 	debug_usage },
 
-	{ { "skinny", "nodebug", NULL },
+	{ { "skinny", "no", "debug", NULL },
 	skinny_no_debug, "Disable Skinny debugging",
-	no_debug_usage, NULL, &cli_skinny_no_debug_deprecated },
+	no_debug_usage },
 
 	{ { "skinny", "reset", NULL },
 	skinny_reset_device, "Reset Skinny device(s)",