diff options
author | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-20 16:18:26 +0000 |
---|---|---|
committer | lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-12-20 16:18:26 +0000 |
commit | 691aaa05b52a1a2c48bb2b1db0d945660763cfe3 (patch) | |
tree | 10230fea7baaa088c6bc5ae205463b4f90e2961d /main | |
parent | bc7757eea52bc1defe656da9befd822d146c4540 (diff) |
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/branches/1.8@299088 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 220a6eb11..5fe9887ea 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> |