From: Sean Bright <sean@malleable.com>
Date: Fri, 3 Dec 2010 17:42:23 +0000 (+0000)
Subject: Merged revisions 297535 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2075
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df87ec438cca87a765e4086fd8fba63b7f1ee35b;p=thirdparty%2Fasterisk.git

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.
  ........
................


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

diff --git a/channels/chan_console.c b/channels/chan_console.c
index 13f1bba8f4..64c1b87fcd 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -1155,7 +1155,7 @@ static char *cli_console_active(struct ast_cli_entry *e, int cmd, struct ast_cli
 
 	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";