From 09fec075c01c811d46b907c6e7d84319714ba9ff Mon Sep 17 00:00:00 2001 From: mmichelson Date: Tue, 21 Jul 2009 14:30:44 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@207725 f38db490-d61c-443f-a65b-d21fe96a405b --- main/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main') diff --git a/main/manager.c b/main/manager.c index ccf95d735..a3a63ee0c 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2167,7 +2167,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" -- cgit v1.2.3