From: Olle Johansson <oej@edvina.net>
Date: Sat, 2 Oct 2010 08:56:08 +0000 (+0000)
Subject: Merged revisions 289950 via svnmerge from
X-Git-Tag: 1.8.0-rc3~4^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d937d6cea397aa56ee44adff5bc14e02aa4198c;p=thirdparty%2Fasterisk.git

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/branches/1.8@289951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/manager.c b/main/manager.c
index cf24d354e6..231c423539 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