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

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Apr 25 18:00:26 2012
New Revision: 363790

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=363790
Log:
Update Pickup application documentation.
........

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

Merged revisions 363789 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=363790&r1=363789&r2=363790
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Wed Apr 25 18:00:26 2012
@@ -55,25 +55,28 @@
 		<synopsis>
 			Directed extension call pickup.
 		</synopsis>
-		<syntax argsep="&amp;">
-			<parameter name="ext" argsep="@" required="true">
-				<argument name="extension" required="true"/>
-				<argument name="context" />
-			</parameter>
-			<parameter name="ext2" argsep="@" multiple="true">
-				<argument name="extension2" required="true"/>
-				<argument name="context2"/>
+		<syntax>
+			<parameter name="targets" argsep="&amp;">
+				<argument name="exten" argsep="@" required="true">
+					<argument name="extension" required="true"/>
+					<argument name="context" />
+				</argument>
+				<argument name="exten2" argsep="@" multiple="true">
+					<argument name="extension2" required="true"/>
+					<argument name="context2"/>
+				</argument>
 			</parameter>
 		</syntax>
 		<description>
 			<para>This application can pickup any ringing channel that is calling
-			the specified <replaceable>extension</replaceable>. If no <replaceable>context</replaceable>
-			is specified, the current context will be used. If you use the special string <literal>PICKUPMARK</literal>
-			for the context parameter, for example 10 at PICKUPMARK, this application
-			tries to find a channel which has defined a <variable>PICKUPMARK</variable>
-			channel variable with the same value as <replaceable>extension</replaceable>
-			(in this example, <literal>10</literal>). When no parameter is specified, the application
-			will pickup a channel matching the pickup group of the active channel.</para>
+			the specified dialplan <replaceable>extension</replaceable>.  If no dialplan
+			<replaceable>context</replaceable> is specified, the current context will be
+			used.  If you use the special string <literal>PICKUPMARK</literal>
+			for the context, for example 10 at PICKUPMARK, this application tries to find a
+			channel which has defined a channel variable <variable>PICKUPMARK</variable>
+			with the same value as <replaceable>extension</replaceable> (in this example,
+			<literal>10</literal>).  When no parameter is specified, the application will
+			pickup a channel matching the pickup group of the active channel.</para>
 		</description>
 	</application>
 	<application name="PickupChan" language="en_US">