[asterisk-commits] rmudgett: branch 10 r329200 - in /branches/10: ./ apps/app_directed_pickup.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 21 12:32:02 2011
New Revision: 329200

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329200
Log:
Merged revisions 329199 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r329199 | rmudgett | 2011-07-21 12:30:57 -0500 (Thu, 21 Jul 2011) | 17 lines
  
  Update PickupChan documentation.
  
  The PickupChan uses the ampersand as the argument separator.
  Was documented as:
  PickupChan(channel[,channel2[,...][,options]])
  
  Fixed documentation to:
  PickupChan(Technology/Resource[&Technology2/Resource2[&...]][,options])
  
  This is a continuation of ASTERISK-17494 for v1.8 and later.
  
  (closes issue ASTERISK-18144)
  Reported by: Erik Smith
  Patches:
        pickupchan_ducumentation-v2.patch (License #6263) patch uploaded by Erik Smith
  Tested by: Erik Smith
........

Modified:
    branches/10/   (props changed)
    branches/10/apps/app_directed_pickup.c

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

Modified: branches/10/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/apps/app_directed_pickup.c?view=diff&rev=329200&r1=329199&r2=329200
==============================================================================
--- branches/10/apps/app_directed_pickup.c (original)
+++ branches/10/apps/app_directed_pickup.c Thu Jul 21 12:32:02 2011
@@ -80,9 +80,11 @@
 		<synopsis>
 			Pickup a ringing channel.
 		</synopsis>
-		<syntax>
-			<parameter name="channel" required="true" />
-			<parameter name="channel2" multiple="true" />
+		<syntax >
+			<parameter name="Technology/Resource" argsep="&amp;" required="true">
+				<argument name="Technology/Resource" required="true" />
+				<argument name="Technology2/Resource2" required="false" multiple="true" />
+			</parameter>
 			<parameter name="options" required="false">
 				<optionlist>
 					<option name="p">