From: Automerge script Date: Wed, 3 May 2006 21:06:33 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.8-netsec~23 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=696ef068665a089b9999c91e17047824037a8b56;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@24603 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_dial.c b/apps/app_dial.c index a7597aa552..88f147a7c2 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -111,7 +111,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" @@ -144,6 +145,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"