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.2@255505 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 44acc35f8afd5fb9e3d68cbf4d0f5ae66a495452..a12880aaeadece3cacce6ffc9ae46a0b01557ae4 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -309,11 +309,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                </option>
                                <option name="t">
                                        <para>Allow the called party to transfer the calling party by sending the
-                                       DTMF sequence defined in <filename>features.conf</filename>.</para>
+                                       DTMF sequence defined in <filename>features.conf</filename>. This setting does not perform policy enforcement on
+                                       transfers initiated by other methods.</para>
                                </option>
                                <option name="T">
                                        <para>Allow the calling party to transfer the called party by sending the
-                                       DTMF sequence defined in <filename>features.conf</filename>.</para>
+                                       DTMF sequence defined in <filename>features.conf</filename>. This setting does not perform policy enforcement on
+                                       transfers initiated by other methods.</para>
                                </option>
                                <option name="U" argsep="^">
                                        <argument name="x" required="true">

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 3d3c6555e251ccc0f04c7f93ba33213d43d80349..760b1fa538147d44edf204bdceb85b0ba1f6123a 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -92,7 +92,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