diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 14:32:41 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-21 14:32:41 +0000 |
| commit | cbdf06e91e9cd6e8c04c7aeb703492f05fd960ae (patch) | |
| tree | d23fa81fd7271cd5e0d353d6eb3db4b1d8a53cdd /main | |
| parent | 57cd49abc319e8e0893a8795b15f0ad413e2fae1 (diff) | |
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.2@207727 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/manager.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/manager.c b/main/manager.c index 8e90f20f0..6114e6e46 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" |