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 c2bdf513186b19077f5035dffb20b022b09e5205..1b47d011a8dc13fc9f575ecb9b8811b774e59d29 100644 (file)
--- 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">