[svn-commits] mmichelson: branch 1.6.0 r207725 - in /branches/1.6.0: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue Jul 21 09:30:44 2009
New Revision: 207725

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207725
Log:
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
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/manager.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/manager.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=207725&r1=207724&r2=207725
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Tue Jul 21 09:30:44 2009
@@ -2167,7 +2167,7 @@
 "	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"