From: Leif Madsen <leif@leifmadsen.com>
Date: Tue, 2 Mar 2010 19:26:35 +0000 (+0000)
Subject: Merged revisions 249925 via svnmerge from
X-Git-Tag: 1.6.2.6-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc688cf183e54c73fa21aac29dc135fe35c819b4;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@249933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 8c8d9bbed5..4b34e9435d 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>