Merged revisions 329199 via svnmerge from

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