[asterisk-commits] rmudgett: trunk r364110 - in /trunk: ./ apps/app_directed_pickup.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Apr 26 16:11:25 2012
New Revision: 364110

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364110
Log:
Update Pickup application documentation. (With feeling this time.)
........

Merged revisions 364108 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 364109 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/apps/app_directed_pickup.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_directed_pickup.c?view=diff&rev=364110&r1=364109&r2=364110
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Thu Apr 26 16:11:25 2012
@@ -78,14 +78,19 @@
 			<para>2) If the <replaceable>extension</replaceable> is specified with a
 			<replaceable>context</replaceable> of the special string
 			<literal>PICKUPMARK</literal> (for example 10 at PICKUPMARK), the application
-			will pickup a channel which has defined a channel variable
+			will pickup a channel which has defined the channel variable
 			<variable>PICKUPMARK</variable> with the same value as
 			<replaceable>extension</replaceable> (in this example,
 			<literal>10</literal>).</para>
 			<para>3) If the <replaceable>extension</replaceable> is specified
-			with a <replaceable>context</replaceable>, the channel executing at that
-			dialplan location will be picked up.  If no <replaceable>context</replaceable>
-			is specified, the current context will be used.</para>
+			with or without a <replaceable>context</replaceable>, the channel with a
+			matching <replaceable>extension</replaceable> and <replaceable>context</replaceable>
+			will be picked up.  If no <replaceable>context</replaceable> is specified,
+			the current context will be used.</para>
+			<note><para>The <replaceable>extension</replaceable> is typically set on
+			matching channels by the dial application that created the channel.  The
+			<replaceable>context</replaceable> is set on matching channels by the
+			channel driver for the device.</para></note>
 		</description>
 	</application>
 	<application name="PickupChan" language="en_US">