[svn-commits] seanbright: trunk r297536 - in /trunk: ./ channels/chan_console.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri Dec  3 11:42:23 2010
New Revision: 297536

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=297536
Log:
Merged revisions 297535 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297535 | seanbright | 2010-12-03 12:41:30 -0500 (Fri, 03 Dec 2010) | 9 lines
  
  Merged revisions 297534 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r297534 | seanbright | 2010-12-03 12:40:52 -0500 (Fri, 03 Dec 2010) | 3 lines
    
    The CLI command should not contain <placeholder>s, these are for descriptions.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_console.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_console.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_console.c?view=diff&rev=297536&r1=297535&r2=297536
==============================================================================
--- trunk/channels/chan_console.c (original)
+++ trunk/channels/chan_console.c Fri Dec  3 11:42:23 2010
@@ -1155,7 +1155,7 @@
 
 	switch (cmd) {
 	case CLI_INIT:
-		e->command = "console {set|show} active [<device>]";
+		e->command = "console {set|show} active";
 		e->usage =
 			"Usage: console {set|show} active [<device>]\n"
 			"       Set or show the active console device for the Asterisk CLI.\n";