From 238640dc1bcbe0293bb96e2fbb17d6d07bcde829 Mon Sep 17 00:00:00 2001 From: Richard Mudgett <rmudgett@digium.com> Date: Thu, 26 Apr 2012 21:11:25 +0000 Subject: [PATCH] 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 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@364110 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_directed_pickup.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 5d037e7ae7..77a6e46e30 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -78,14 +78,19 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <para>2) If the <replaceable>extension</replaceable> is specified with a <replaceable>context</replaceable> of the special string <literal>PICKUPMARK</literal> (for example 10@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"> -- GitLab