diff options
| author | Leif Madsen <leif@leifmadsen.com> | 2011-10-03 20:07:08 +0000 |
|---|---|---|
| committer | Leif Madsen <leif@leifmadsen.com> | 2011-10-03 20:07:08 +0000 |
| commit | 12a61316531286c2d6d8ac42b103a2fa0b677324 (patch) | |
| tree | 31de770062ad3c19a9763eb5e1099cf250fe3fbf /apps | |
| parent | 4f01bb5e502a4e65a16e4f2ea9995e2351d7ba9c (diff) | |
Merged revisions 339145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r339145 | lmadsen | 2011-10-03 14:55:15 -0500 (Mon, 03 Oct 2011) | 13 lines
Merged revisions 339144 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r339144 | lmadsen | 2011-10-03 14:54:52 -0500 (Mon, 03 Oct 2011) | 6 lines
Make documentation for Dial() options 'F' and 'F()' more clear.
(Closes issue ASTERISK-18646)
Reported by: Physis Heckman
Tested by: Richard Mudgett
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index a9d1079a1..bd1794916 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -152,12 +152,21 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <argument name="context" required="false" /> <argument name="exten" required="false" /> <argument name="priority" required="true" /> - <para>When the caller hangs up, transfer the called party - to the specified destination and continue execution at that location.</para> + <para>When the caller hangs up, transfer the <emphasis>called</emphasis> party + to the specified destination and <emphasis>start</emphasis> execution at that location.</para> + <note> + <para>Any channel variables you want the called channel to inherit from the caller channel must be + prefixed with one or two underbars ('_').</para> + </note> </option> <option name="F"> - <para>Proceed with dialplan execution at the next priority in the current extension if the - source channel hangs up.</para> + <para>When the caller hangs up, transfer the <emphasis>called</emphasis> party to the next priority of the current extension + and <emphasis>start</emphasis> execution at that location.</para> + <note> + <para>Any channel variables you want the called channel to inherit from the caller channel must be + prefixed with one or two underbars ('_').</para> + <para>Additionally, using this option from a Macro() or GoSub() might not make sense as there would be no return points</para> + </note> </option> <option name="g"> <para>Proceed with dialplan execution at the next priority in the current extension if the |