Merge from 1.4

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@46224 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 05b8e82cb2bf73e87c5a8baf1bd17dc514439820..e230e3840df0771f2994fc1070826fc463705366 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -16965,7 +16965,7 @@ static struct ast_cli_entry cli_sip[] = {
        sip_show_registry, "List SIP registration status",
        show_reg_usage },
 
-       { { "sip", "list", "settings", NULL },
+       { { "sip", "show", "settings", NULL },
        sip_show_settings, "List SIP global settings",
        show_settings_usage },