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

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jul 21 12:33:06 2011
New Revision: 329201

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

................
  r329200 | rmudgett | 2011-07-21 12:32:02 -0500 (Thu, 21 Jul 2011) | 24 lines
  
  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:
    trunk/   (props changed)
    trunk/apps/app_directed_pickup.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-merged (original)
+++ branch-10-merged Thu Jul 21 12:33:06 2011
@@ -1,1 +1,1 @@
-/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145
+/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200

Modified: trunk/apps/app_directed_pickup.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_directed_pickup.c?view=diff&rev=329201&r1=329200&r2=329201
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Thu Jul 21 12:33:06 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">