From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 21 Jul 2011 17:32:02 +0000 (+0000)
Subject: Merged revisions 329199 via svnmerge from
X-Git-Tag: 10.0.0-beta1~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca36c7a5dafece8fd88e13d84d9caa23e5c56216;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@329200 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index c2bdf51318..1b47d011a8 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -80,9 +80,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		<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">