dect
/
asterisk
Archived
13
0
Fork 0

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
This commit is contained in:
rmudgett 2011-07-21 17:33:06 +00:00
parent ce2f61013b
commit 42df093d7a
1 changed files with 5 additions and 3 deletions

View File

@ -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">