aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-02 19:26:35 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-03-02 19:26:35 +0000
commite21acba35a591a01e81b1054b4ada6b85db55242 (patch)
tree31c78bdfb3c26664f79ec7b4080e3e8617e3b5af /main
parent71bd4ecc4a15d2927bb201939a401256e14b14fa (diff)
Merged revisions 249925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r249925 | lmadsen | 2010-03-02 14:24:43 -0500 (Tue, 02 Mar 2010) | 6 lines Add missing description of the PARKINGLOT variable in XML documentation. (closes issue #16743) Reported by: snuffy Patches: parkingdoc.diff uploaded by snuffy (license 35) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@249933 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/features.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index 8c8d9bbed..4b34e9435 100644
--- a/main/features.c
+++ b/main/features.c
@@ -145,6 +145,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
registered internally and does not need to be explicitly added
into the dialplan, although you should include the <literal>parkedcalls</literal>
context (or the context specified in <filename>features.conf</filename>).</para>
+ <para>If you set the <variable>PARKINGLOT</variable> variable, the call will be parked
+ in the specifed parking context. Note setting this variable overrides the <variable>
+ PARKINGLOT</variable> set by the <literal>CHANNEL</literal> function.</para>
<para>If you set the <variable>PARKINGEXTEN</variable> variable to an extension in your
parking context, Park() will park the call on that extension, unless
it already exists. In that case, execution will continue at next priority.</para>