From: Olle Johansson <oej@edvina.net>
Date: Sat, 2 Oct 2010 08:58:34 +0000 (+0000)
Subject: Merged revisions 289951 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=138d5165e3d205c7302ee5b5c201baf4030ebf73;p=thirdparty%2Fasterisk.git

Merged revisions 289951 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289951 | oej | 2010-10-02 10:56:08 +0200 (Lör, 02 Okt 2010) | 16 lines

  Merged revisions 289950 via svnmerge from
  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/trunk@289952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index 493b843603..fe8b943b6f 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -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