[svn-commits] file: branch 1.6.1 r165794 - in /branches/1.6.1: ./ apps/ channels/ pbx/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Dec 18 15:24:01 CST 2008
Author: file
Date: Thu Dec 18 15:24:00 2008
New Revision: 165794
URL: http://svn.digium.com/view/asterisk?view=rev&rev=165794
Log:
Merged revisions 165792 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r165792 | file | 2008-12-18 17:21:44 -0400 (Thu, 18 Dec 2008) | 6 lines
Numerous documentation updates.
(closes issue #13970)
Reported by: pkempgen
Patches:
__20081217_cli_usage_fixes.patch.txt uploaded by blitzrage (license 10)
........
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/apps/app_queue.c
branches/1.6.1/channels/chan_dahdi.c
branches/1.6.1/channels/chan_misdn.c
branches/1.6.1/channels/chan_oss.c
branches/1.6.1/channels/chan_sip.c
branches/1.6.1/pbx/pbx_ael.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_queue.c?view=diff&rev=165794&r1=165793&r2=165794
==============================================================================
--- branches/1.6.1/apps/app_queue.c (original)
+++ branches/1.6.1/apps/app_queue.c Thu Dec 18 15:24:00 2008
@@ -6363,9 +6363,9 @@
e->command = "queue {pause|unpause} member";
e->usage =
"Usage: queue {pause|unpause} member <member> [queue <queue> [reason <reason>]]\n"
- " Pause or unpause a queue member. Not specifying a particular queue\n"
- " will pause or unpause a member across all queues to which the member\n"
- " belongs.\n";
+ " Pause or unpause a queue member. Not specifying a particular queue\n"
+ " will pause or unpause a member across all queues to which the member\n"
+ " belongs.\n";
return NULL;
case CLI_GENERATE:
return complete_queue_pause_member(a->line, a-> word, a->pos, a->n);
@@ -6437,8 +6437,8 @@
e->command = "queue set penalty";
e->usage =
"Usage: queue set penalty <penalty> on <interface> [in <queue>]\n"
- "Set a member's penalty in the queue specified. If no queue is specified\n"
- "then that interface's penalty is set in all queues to which that interface is a member\n";
+ " Set a member's penalty in the queue specified. If no queue is specified\n"
+ " then that interface's penalty is set in all queues to which that interface is a member\n";
return NULL;
case CLI_GENERATE:
return complete_queue_set_member_penalty(a->line, a->word, a->pos, a->n);
@@ -6499,8 +6499,8 @@
e->command = "queue rules show";
e->usage =
"Usage: queue rules show [rulename]\n"
- "Show the list of rules associated with rulename. If no\n"
- "rulename is specified, list all rules defined in queuerules.conf\n";
+ " Show the list of rules associated with rulename. If no\n"
+ " rulename is specified, list all rules defined in queuerules.conf\n";
return NULL;
case CLI_GENERATE:
return complete_queue_rule_show(a->line, a->word, a->pos, a->n);
@@ -6530,7 +6530,7 @@
e->command = "queue rules reload";
e->usage =
"Usage: queue rules reload\n"
- "Reloads rules defined in queuerules.conf\n";
+ " Reloads rules defined in queuerules.conf\n";
return NULL;
case CLI_GENERATE:
return NULL;
Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=165794&r1=165793&r2=165794
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Thu Dec 18 15:24:00 2008
@@ -11911,7 +11911,9 @@
switch (cmd) {
case CLI_INIT:
e->command = "pri show debug";
- e->usage = "Show the debug state of pri spans\n";
+ e->usage =
+ "Usage: pri show debug\n"
+ " Show the debug state of pri spans\n";
return NULL;
case CLI_GENERATE:
return NULL;
@@ -11945,7 +11947,9 @@
switch (cmd) {
case CLI_INIT:
e->command = "pri show version";
- e->usage = "Show libpri version information\n";
+ e->usage =
+ "Usage: pri show version\n"
+ "Show libpri version information\n";
return NULL;
case CLI_GENERATE:
return NULL;
@@ -12777,10 +12781,10 @@
e->command = "dahdi set dnd";
e->usage =
"Usage: dahdi set dnd <chan#> <on|off>\n"
- " Sets/resets DND (Do Not Disturb) mode on a channel.\n"
- " Changes take effect immediately.\n"
- " <chan num> is the channel number\n"
- " <on|off> Enable or disable DND mode?\n"
+ " Sets/resets DND (Do Not Disturb) mode on a channel.\n"
+ " Changes take effect immediately.\n"
+ " <chan num> is the channel number\n"
+ " <on|off> Enable or disable DND mode?\n"
;
return NULL;
case CLI_GENERATE:
@@ -13486,7 +13490,9 @@
switch (cmd) {
case CLI_INIT:
e->command = "ss7 show version";
- e->usage = "Show the libss7 version\n";
+ e->usage =
+ "Usage: ss7 show version\n"
+ " Show the libss7 version\n";
return NULL;
case CLI_GENERATE:
return NULL;
Modified: branches/1.6.1/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_misdn.c?view=diff&rev=165794&r1=165793&r2=165794
==============================================================================
--- branches/1.6.1/channels/chan_misdn.c (original)
+++ branches/1.6.1/channels/chan_misdn.c Thu Dec 18 15:24:00 2008
@@ -1006,7 +1006,7 @@
e->command = "misdn show config";
e->usage =
"Usage: misdn show config [<port> | description <config element> | descriptions [general|ports]]\n"
- " Use 0 for <port> to only print the general config.\n";
+ " Use 0 for <port> to only print the general config.\n";
return NULL;
case CLI_GENERATE:
return complete_show_config(a);
Modified: branches/1.6.1/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_oss.c?view=diff&rev=165794&r1=165793&r2=165794
==============================================================================
--- branches/1.6.1/channels/chan_oss.c (original)
+++ branches/1.6.1/channels/chan_oss.c Thu Dec 18 15:24:00 2008
@@ -877,8 +877,9 @@
switch (cmd) {
case CLI_INIT:
e->command = CONSOLE_VIDEO_CMDS;
- e->usage = "Usage: " CONSOLE_VIDEO_CMDS "...\n"
- " Generic handler for console commands.\n";
+ e->usage =
+ "Usage: " CONSOLE_VIDEO_CMDS "...\n"
+ " Generic handler for console commands.\n";
return NULL;
case CLI_GENERATE:
Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=165794&r1=165793&r2=165794
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Thu Dec 18 15:24:00 2008
@@ -12985,9 +12985,9 @@
if (cmd == CLI_INIT) {
e->command = "sip prune realtime [peer|all] [all|like]";
e->usage =
- "Usage: sip prune realtime [peer] [<name>|all|like <pattern>]\n"
- " Prunes object(s) from the cache.\n"
- " Optional regular expression pattern is used to filter the objects.\n";
+ "Usage: sip prune realtime [peer [<name>|all|like <pattern>]|all]\n"
+ " Prunes object(s) from the cache.\n"
+ " Optional regular expression pattern is used to filter the objects.\n";
return NULL;
} else if (cmd == CLI_GENERATE) {
if (a->pos == 4) {
@@ -14011,10 +14011,10 @@
if (cmd == CLI_INIT) {
e->command = "sip show {channels|subscriptions}";
e->usage =
- "Usage: sip show channels\n"
- " Lists all currently active SIP calls (dialogs).\n"
- "Usage: sip show subscriptions\n"
- " Lists active SIP subscriptions.\n";
+ "Usage: sip show channels\n"
+ " Lists all currently active SIP calls (dialogs).\n"
+ "Usage: sip show subscriptions\n"
+ " Lists active SIP subscriptions.\n";
return NULL;
} else if (cmd == CLI_GENERATE)
return NULL;
@@ -14759,7 +14759,7 @@
case CLI_INIT:
e->command = "sip set history {on|off}";
e->usage =
- "Usage: sip history {on|off}\n"
+ "Usage: sip set history {on|off}\n"
" Enables/Disables recording of SIP dialog history for debugging purposes.\n"
" Use 'sip show history' to view the history of a call number.\n";
return NULL;
Modified: branches/1.6.1/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/pbx/pbx_ael.c?view=diff&rev=165794&r1=165793&r2=165794
==============================================================================
--- branches/1.6.1/pbx/pbx_ael.c (original)
+++ branches/1.6.1/pbx/pbx_ael.c Thu Dec 18 15:24:00 2008
@@ -198,7 +198,7 @@
case CLI_INIT:
e->command = "ael set debug {read|tokens|macros|contexts|off}";
e->usage =
- "Usage: ael debug {read|tokens|macros|contexts|off}\n"
+ "Usage: ael set debug {read|tokens|macros|contexts|off}\n"
" Enable AEL read, token, macro, or context debugging,\n"
" or disable all AEL debugging messages. Note: this\n"
" currently does nothing.\n";
More information about the svn-commits
mailing list