Merged revisions 329200 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Thu, 21 Jul 2011 17:33:06 +0000 (17:33 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 21 Jul 2011 17:33:06 +0000 (17:33 +0000)
commita2e30b19082cddb82e7e0e50128b5b2d111173ec
tree009792176e1da9d3b0a9ac2aa3c2bb0463d28a2e
parent3b80737787f180a3791d4bf955178f25db860ade
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: https://origsvn.digium.com/svn/asterisk/trunk@329201 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_directed_pickup.c