From ef5097f7805184a21929702dd7e28cfce9dc3261 Mon Sep 17 00:00:00 2001
From: lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 20 Dec 2010 16:19:22 +0000
Subject: [PATCH] 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: http://svn.digium.com/svn/asterisk/trunk@299089 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/features.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/features.c b/main/features.c
index 0afb17e95..032c68b5c 100644
--- 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>