From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 21 Jul 2009 14:29:40 +0000 (+0000)
Subject: Merged revisions 207714 via svnmerge from
X-Git-Tag: 11.0.0-beta1~4466
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b1d9b989ee33667c7d12f91682485cafdf5b86c7;p=thirdparty%2Fasterisk.git

Merged revisions 207714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r207714 | mmichelson | 2009-07-21 09:26:00 -0500 (Tue, 21 Jul 2009) | 5 lines

  Document default timeout for AMI originations.

  AST-224
........


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

diff --git a/main/manager.c b/main/manager.c
index c7e4ce4c65..f4d9e1e6f5 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -415,8 +415,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			<parameter name="Data">
 				<para>Data to use (requires <literal>Application</literal>).</para>
 			</parameter>
-			<parameter name="Timeout">
-				<para>How long to wait for call to be answered (in ms).</para>
+			<parameter name="Timeout" default="30000">
+				<para>How long to wait for call to be answered (in ms.).</para>
 			</parameter>
 			<parameter name="CallerID">
 				<para>Caller ID to be set on the outgoing channel.</para>