]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 289950 via svnmerge from
authorOlle Johansson <oej@edvina.net>
Sat, 2 Oct 2010 08:56:08 +0000 (08:56 +0000)
committerOlle Johansson <oej@edvina.net>
Sat, 2 Oct 2010 08:56:08 +0000 (08:56 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r289950 | oej | 2010-10-02 10:52:03 +0200 (Lör, 02 Okt 2010) | 9 lines

  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.8@289951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/manager.c

index cf24d354e61da6b17a76f5b74e4f5e0c64fcf3bb..231c423539bf4a7cd4f098569029dcd67b508d5a 100644 (file)
@@ -441,6 +441,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <parameter name="Async">
                                <para>Set to <literal>true</literal> for fast origination.</para>
                        </parameter>
+                       <parameter name="Codecs">
+                               <para>Comma-separated list of codecs to use for this call.</para>
+                       </parameter>
                </syntax>
                <description>
                        <para>Generates an outgoing call to a