From d272081a3b98571587c5338259b8f7af31cebe45 Mon Sep 17 00:00:00 2001 From: murf Date: Wed, 29 Oct 2008 05:52:41 +0000 Subject: 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 --- apps/app_queue.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'apps/app_queue.c') diff --git a/apps/app_queue.c b/apps/app_queue.c index 7298945f2..a9f717083 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -160,26 +160,37 @@ static char *descrip = "The option string may contain zero or more of the following characters:\n" " 'c' -- continue in the dialplan if the callee hangs up.\n" " 'd' -- data-quality (modem) call (minimum delay).\n" -" 'h' -- allow callee to hang up by pressing *.\n" -" 'H' -- allow caller to hang up by pressing *.\n" +" 'h' -- allow callee to hang up by hitting '*', or whatver disconnect sequence\n" +" that is defined in the featuremap section in features.conf.\n" +" 'H' -- allow caller to hang up by hitting '*', or whatever disconnect sequence\n" +" that is 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. Periodic Announcements are still made, if applicable.\n" -" 't' -- allow the called user to transfer the calling user.\n" -" 'T' -- allow the calling user to transfer the call.\n" -" 'w' -- allow the called user to write the conversation to disk via Monitor.\n" -" 'W' -- allow the calling user to write the conversation to disk via Monitor.\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" " '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" " '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" " 'x' -- allow the called user to write the conversation to disk via MixMonitor\n" +" by pressing the automixmon sequence defined in the featuremap section in\n" +" features.conf\n" " 'X' -- allow the calling user to write the conversation to disk via MixMonitor\n" - -" In addition to transferring the call, a call may be parked and then picked\n" -"up by another user.\n" +" by pressing the automixmon sequence defined in the featuremap section in\n" +" 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" -- cgit v1.2.3