From bdf2a05aa511ca81f10e582bf40b611de1b382cc Mon Sep 17 00:00:00 2001 From: BJ Weschke Date: Wed, 3 May 2006 21:11:23 +0000 Subject: Merged revisions 24567 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r24567 | bweschke | 2006-05-03 15:58:10 -0500 (Wed, 03 May 2006) | 3 lines Correct application documentation to make users aware that certain options cannot be used in conjunction with others. #6666 (chotaire) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24604 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'apps/app_dial.c') diff --git a/apps/app_dial.c b/apps/app_dial.c index bdf7f7f82..6dddb855b 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -113,7 +113,8 @@ static char *descrip = " G(context^exten^pri) - If the call is answered, transfer the calling party to\n" " the specified priority and the called party to the specified priority+1.\n" " Optionally, an extension, or extension and context may be specified. \n" -" Otherwise, the current extension is used.\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" " j - Jump to priority n+101 if all of the requested channels were busy.\n" @@ -146,6 +147,8 @@ static char *descrip = " * GOTO:^^ - Transfer the call to the\n" " specified priority. Optionally, an extension, or\n" " extension and priority can be specified.\n" +" You cannot use any additional action post answer options in conjunction\n" +" with this option.\n" " n - This option is a modifier for the screen/privacy mode. It specifies\n" " that no introductions are to be saved in the priv-callerintros\n" " directory.\n" -- cgit v1.2.3