[asterisk-commits] lmadsen: branch 1.6.2 r249933 - in /branches/1.6.2: ./ main/features.c

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Mar  2 13:26:35 2010
New Revision: 249933

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249933
Log:
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)
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/features.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=249933&r1=249932&r2=249933
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Tue Mar  2 13:26:35 2010
@@ -145,6 +145,9 @@
 			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>