From: Olle Johansson Date: Sat, 2 Oct 2010 08:52:03 +0000 (+0000) Subject: Merged revisions 289949 via svnmerge from X-Git-Tag: 1.6.2.15-rc1~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0bbccaf251524ee1d128f8d7c9f0f474b28f1ce;p=thirdparty%2Fasterisk.git 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 b1ea5d3743..5d30789dd1 100644 --- 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";