diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-21 17:33:06 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-07-21 17:33:06 +0000 |
| commit | 42df093d7a08aaab59f8a0cc5f73456d45fa3f9d (patch) | |
| tree | 009792176e1da9d3b0a9ac2aa3c2bb0463d28a2e | |
| parent | ce2f61013b364080d7ddabfcb48ac297d5758fbc (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329201 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_directed_pickup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index c2bdf5131..1b47d011a 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="&" 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"> |