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
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299089 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index 0afb17e95ef64e1f1267675d528c08d669e19b5c..032c68b5ce9ecfe3da89255806918eeaf97c4cd9 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -179,7 +179,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                </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>