From 08a09ead1cc49f876d47080fde9332bf941ec227 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 21 Jul 2009 14:32:41 +0000 Subject: [PATCH] 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.2@207727 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/manager.c b/main/manager.c index 8e90f20f07..6114e6e46c 100644 --- a/main/manager.c +++ b/main/manager.c @@ -2362,7 +2362,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"