diff options
| -rw-r--r-- | apps/app_dial.c | 24 | ||||
| -rw-r--r-- | apps/app_queue.c | 20 | ||||
| -rw-r--r-- | configs/features.conf.sample | 10 |
3 files changed, 36 insertions, 18 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 97186f275..1dae16dd5 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -126,15 +126,19 @@ 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" " j - Jump to priority n+101 if all of the requested channels were busy.\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" @@ -195,13 +199,17 @@ 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" " 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"; /* RetryDial App by Anthony Minessale II <anthmct@yahoo.com> Jan/2005 */ static char *rapp = "RetryDial"; diff --git a/apps/app_queue.c b/apps/app_queue.c index dfb148c9c..da97d5ca9 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -156,19 +156,29 @@ static char *descrip = "any of the join options cause the caller to not enter the queue.\n" "The option string may contain zero or more of the following characters:\n" " 'd' -- data-quality (modem) call (minimum delay).\n" -" 'h' -- allow callee to hang up by hitting *.\n" -" 'H' -- allow caller to hang up by hitting *.\n" +" 'h' -- allow callee to hang up by hitting '*', or whatver disconnect sequence\n" +" defined in the featuremap section in features.conf.\n" +" 'H' -- allow caller to hang up by hitting '*', or whatever disconnect sequence\n" +" defined in the featuremap section in features.conf.\n" " 'n' -- no retries on the timeout; will exit this application and \n" " go to the next step.\n" " 'i' -- ignore call forward requests from queue members and do nothing\n" " when they are requested.\n" " 'r' -- ring instead of playing MOH\n" -" 't' -- allow the called user transfer the calling user\n" -" 'T' -- to allow the calling user to transfer the call.\n" +" 't' -- allow the called user transfer the calling user by pressing '#' or\n" +" whatever blindxfer sequence defined in the featuremap section in\n" +" features.conf\n" +" 'T' -- to allow the calling user to transfer the call by pressing '#' or\n" +" whatever blindxfer sequence defined in the featuremap section in\n" +" features.conf\n" " 'w' -- allow the called user to write the conversation to disk via Monitor\n" +" by pressing the automon sequence defined in the featuremap section in\n" +" features.conf\n" " 'W' -- allow the calling user to write the conversation to disk via Monitor\n" +" by pressing the automon sequence defined in the featuremap section in\n" +" features.conf\n" " In addition to transferring the call, a call may be parked and then picked\n" -"up by another user.\n" +"up by another user, by transferring to the parking lot extension. See features.conf.\n" " The optional URL will be sent to the called party if the channel supports\n" "it.\n" " The optional AGI parameter will setup an AGI script to be executed on the \n" diff --git a/configs/features.conf.sample b/configs/features.conf.sample index 92f757209..1d574c990 100644 --- a/configs/features.conf.sample +++ b/configs/features.conf.sample @@ -38,11 +38,11 @@ context => parkedcalls ; Which context parked calls are in ; chan_local in combination with Answer to accomplish it. [featuremap] -;blindxfer => #1 ; Blind transfer (default is #) -;disconnect => *0 ; Disconnect (default is *) -;automon => *1 ; One Touch Record a.k.a. Touch Monitor -;atxfer => *2 ; Attended transfer -;parkcall => #72 ; Park call (one step parking) +;blindxfer => #1 ; Blind transfer (default is #) -- Make sure to set the T and/or t option in the Dial() or Queue() app call! +;disconnect => *0 ; Disconnect (default is *) -- Make sure to set the H and/or h option in the Dial() or Queue() app call! +;automon => *1 ; One Touch Record a.k.a. Touch Monitor -- Make sure to set the W and/or w option in the Dial() or Queue() app call! +;atxfer => *2 ; Attended transfer -- Make sure to set the T and/or t option in the Dial() or Queue() app call! +;parkcall => #72 ; Park call (one step parking) -- Make sure to set the K and/or K option in the Dial() app call! [applicationmap] ; Note that the DYNAMIC_FEATURES channel variable must be set to use the features |