Merged revisions 289949 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r289949 | oej | 2010-10-02 10:50:05 +0200 (Lör, 02 Okt 2010) | 2 lines

  Add documentation for undocumented option to AMI action originate
........

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

diff --git a/main/manager.c b/main/manager.c
index b1ea5d3743c02bfa78d5a63d34b6e71a89000ad3..5d30789dd1f2d987b6227d345f45a518e26026ed 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -2432,6 +2432,7 @@ static char mandescr_originate[] =
 "      Timeout: How long to wait for call to be answered (in ms. Default: 30000)\n"
 "      CallerID: Caller ID to be set on the outgoing channel\n"
 "      Variable: Channel variable to set, multiple Variable: headers are allowed\n"
+"      Codecs: Comma-separated list of codecs to use for the new channels\n"
 "      Account: Account code\n"
 "      Async: Set to 'true' for fast origination\n";