diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-29 05:52:41 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-29 05:52:41 +0000 |
commit | d272081a3b98571587c5338259b8f7af31cebe45 (patch) | |
tree | fd2d33281646061540971d1274541f64013897be /apps/app_dial.c | |
parent | 1f6ad7c209a000caa1b9ce84e7446a730e475879 (diff) |
Merged revisions 152605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r152605 | murf | 2008-10-28 23:47:13 -0600 (Tue, 28 Oct 2008) | 22 lines
Merged revisions 152538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines
A little documentation cross-ref between features and
dial and queue... I wasted some time (stupidly) trying
to get the one-touch parking stuff working, because it
didn't occur to me that I had to also have the corresponding
options in the dial command! Duh! (In all this time, I never
set this up before!)
So, to keep some poor fool from suffering the same fate,
I made the features.conf.sample file mention the corresponding
opts in dial/queue; and the docs for dial/app specifically
mention the corresponding decls in the feature.conf file.
I hope this doesn't spoil some vast, eternal plan...
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@152606 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 777e4830e..b0b4c3abb 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -126,14 +126,18 @@ static char *descrip = " Optionally, an extension, or extension and context may be specified. \n" " Otherwise, the current extension is used. You cannot use any additional\n" " action post answer options in conjunction with this option.\n" -" h - Allow the called party to hang up by sending the '*' DTMF digit.\n" -" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n" +" h - Allow the called party to hang up by sending the '*' DTMF digit, or\n" +" whatever sequence was defined in the featuremap section for\n" +" 'disconnect' in features.conf\n" +" H - Allow the calling party to hang up by hitting the '*' DTMF digit, or\n" +" whatever sequence was defined in the featuremap section for\n" +" 'disconnect' in features.conf\n" " i - Asterisk will ignore any forwarding requests it may receive on this\n" " dial attempt.\n" " k - Allow the called party to enable parking of the call by sending\n" -" the DTMF sequence defined for call parking in features.conf.\n" +" the DTMF sequence defined for call parking in the featuremap section of features.conf.\n" " K - Allow the calling party to enable parking of the call by sending\n" -" the DTMF sequence defined for call parking in features.conf.\n" +" the DTMF sequence defined for call parking in the featuremap section of features.conf.\n" " L(x[:y][:z]) - Limit the call to 'x' ms. Play a warning when 'y' ms are\n" " left. Repeat the warning every 'z' ms. The following special\n" " variables can be used with this option:\n" @@ -192,9 +196,11 @@ static char *descrip = " S(x) - Hang up the call after 'x' seconds *after* the called party has\n" " answered the call.\n" " t - Allow the called party to transfer the calling party by sending the\n" -" DTMF sequence defined in features.conf.\n" +" DTMF sequence defined in the blindxfer setting in the featuremap section\n" +" of features.conf.\n" " T - Allow the calling party to transfer the called party by sending the\n" -" DTMF sequence defined in features.conf.\n" +" DTMF sequence defined in the blindxfer setting in the featuremap section\n" +" of features.conf.\n" " U(x[^arg]) - Execute via Gosub the routine 'x' for the *called* channel before connecting\n" " to the calling channel. Arguments can be specified to the Gosub\n" " using '^' as a delimiter. The Gosub routine can set the variable\n" @@ -211,13 +217,17 @@ static char *descrip = " with this option. Also, pbx services are not run on the peer (called) channel,\n" " so you will not be able to set timeouts via the TIMEOUT() function in this routine.\n" " w - Allow the called party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch recording in features.conf.\n" +" the DTMF sequence defined in the automon setting in the featuremap section\n" +" of features.conf.\n" " W - Allow the calling party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch recording in features.conf.\n" +" the DTMF sequence defined in the automon setting in the featuremap section\n" +" of features.conf.\n" " x - Allow the called party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch automixmonitor in features.conf\n" +" the DTMF sequence defined in the automixmon setting in the featuremap section\n" +" of features.conf.\n" " X - Allow the calling party to enable recording of the call by sending\n" -" the DTMF sequence defined for one-touch automixmonitor in features.conf\n"; +" the DTMF sequence defined in the automixmon setting in the featuremap section\n" +" of features.conf.\n"; /* RetryDial App by Anthony Minessale II <anthmct@yahoo.com> Jan/2005 */ static char *rapp = "RetryDial"; |