From: Leif Madsen Date: Wed, 31 Mar 2010 17:54:13 +0000 (+0000) Subject: Merged revisions 255504 via svnmerge from X-Git-Tag: 1.6.0.27-rc1~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6b89675b6bce29fdf358f5a1259543c935c9fd8;p=thirdparty%2Fasterisk.git Merged revisions 255504 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r255504 | lmadsen | 2010-03-31 12:48:09 -0500 (Wed, 31 Mar 2010) | 5 lines Add documentation clarifying when 't' and 'T' can be used. (closes issue #17021) Reported by: kovzol Tested by: lmadsen, kovzol, davidw, ebroad ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255507 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_dial.c b/apps/app_dial.c index 3b9a612447..5c39111064 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -198,10 +198,12 @@ static char *descrip = " answered the call.\n" " t - Allow the called party to transfer the calling party by sending the\n" " DTMF sequence defined in the blindxfer setting in the featuremap section\n" -" of features.conf.\n" +" of features.conf. This setting does not perform policy enforcement on\n" +" transfers initiated by other methods.\n" " T - Allow the calling party to transfer the called party by sending the\n" " DTMF sequence defined in the blindxfer setting in the featuremap section\n" -" of features.conf.\n" +" of features.conf. This setting does not perform policy enforcement on\n" +" transfers initiated by other methods.\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 delimeter. The Gosub routine can set the variable\n" diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index fab707be28..26c42adc5c 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -88,7 +88,8 @@ context=default ; Default context for incoming calls ; instead of the From: field. allowoverlap=no ; Disable overlap dialing support. (Default is yes) ;allowtransfer=no ; Disable all transfers (unless enabled in peers or users) - ; Default is enabled + ; Default is enabled. The Dial() options 't' and 'T' are not + ; related as to whether SIP transfers are allowed or not. ;realm=mydomain.tld ; Realm for digest authentication ; defaults to "asterisk". If you set a system name in ; asterisk.conf, it defaults to that system name