From: Mark Michelson Date: Tue, 21 Jul 2009 14:31:32 +0000 (+0000) Subject: Merged revisions 207723 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c84d8a38ad9415c1141100d4d0ba5739bbb80b6;p=thirdparty%2Fasterisk.git Merged revisions 207723 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r207723 | mmichelson | 2009-07-21 09:29:40 -0500 (Tue, 21 Jul 2009) | 11 lines 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/branches/1.6.1@207726 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/manager.c b/main/manager.c index e9f84e138b..b279813340 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2356,7 +2356,7 @@ static char mandescr_originate[] = " Priority: Priority to use (requires 'Exten' and 'Context')\n" " Application: Application to use\n" " Data: Data to use (requires 'Application')\n" -" Timeout: How long to wait for call to be answered (in ms)\n" +" 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" " Account: Account code\n"