[svn-commits] lmadsen: trunk r299089 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Mon Dec 20 10:19:22 2010
New Revision: 299089

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=299089
Log:
Merged revisions 299088 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r299088 | lmadsen | 2010-12-20 10:18:26 -0600 (Mon, 20 Dec 2010) | 13 lines
  
  Merged revisions 299087 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r299087 | lmadsen | 2010-12-20 10:18:03 -0600 (Mon, 20 Dec 2010) | 5 lines
    
    Note that Park() timeout is milliseconds.
    
    (closes issue #15758)
    Reported by: mmurdock
    Tested by: mmurdock, seanbright
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=299089&r1=299088&r2=299089
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Mon Dec 20 10:19:22 2010
@@ -179,7 +179,7 @@
 		</synopsis>
 		<syntax>
 			<parameter name="timeout">
-				<para>A custom parking timeout for this parked call.</para>
+				<para>A custom parking timeout for this parked call. Value in milliseconds.</para>
 			</parameter>
 			<parameter name="return_context">
 				<para>The context to return the call to after it times out.</para>