diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-03 20:58:48 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-03 20:58:48 +0000 |
| commit | 538f4ca207028ee047ffadc741278584c2ca43bc (patch) | |
| tree | 80d368e550777a4a58bfd45fded1fad152c9b5fc /doc | |
| parent | b78e0c85c91f64adf0a9f023e302e9e38038d7b7 (diff) | |
Merged revisions 210190 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r210190 | kpfleming | 2009-08-03 15:48:48 -0500 (Mon, 03 Aug 2009) | 11 lines
Rename 'canreinvite' option to 'directmedia', with backwards compatibility.
It is clear from multiple mailing list, forum, wiki and other sorts of posts
that users don't really understand the effects that the 'canreinvite' config
option actually has, and that in some cases they think that setting it to 'no'
will actually cause various other features (T.38, MOH, etc.) to not work properly,
when in fact this is not the case. This patch changes the proper name of the
option to what it should have been from the beginning ('directmedia'), but
preserves backwards compatibility for existing configurations.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@210191 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/chan_sip-perf-testing.txt | 2 | ||||
| -rw-r--r-- | doc/res_config_sqlite.txt | 2 | ||||
| -rw-r--r-- | doc/tex/phoneprov.tex | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/chan_sip-perf-testing.txt b/doc/chan_sip-perf-testing.txt index 85b22bddc..56992ac7f 100644 --- a/doc/chan_sip-perf-testing.txt +++ b/doc/chan_sip-perf-testing.txt @@ -58,7 +58,7 @@ type=friend context=test11 host=192.168.134.240 ;; the address of the host you will be running sipp on user=sipp -canreinvite=no +directmedia=no disallow=all allow=ulaw diff --git a/doc/res_config_sqlite.txt b/doc/res_config_sqlite.txt index 39d31521a..95322cf10 100644 --- a/doc/res_config_sqlite.txt +++ b/doc/res_config_sqlite.txt @@ -70,7 +70,7 @@ CREATE TABLE ast_sip ( callgroup VARCHAR(10) DEFAULT NULL, callerid VARCHAR(80) DEFAULT NULL, cancallforward CHAR(3) DEFAULT 'yes', - canreinvite CHAR(3) DEFAULT 'yes', + directmedia CHAR(3) DEFAULT 'yes', context VARCHAR(80) DEFAULT NULL, defaultip VARCHAR(15) DEFAULT NULL, dtmfmode VARCHAR(7) DEFAULT NULL, diff --git a/doc/tex/phoneprov.tex b/doc/tex/phoneprov.tex index cb236a89a..04ca22fd0 100644 --- a/doc/tex/phoneprov.tex +++ b/doc/tex/phoneprov.tex @@ -146,7 +146,7 @@ threewaycalling = yes deletevoicemail = no autoprov = yes profile = polycom -canreinvite = no +directmedia = no nat = no fullname = User Two ; ${DISPLAY_NAME} secret = test ; ${SECRET} |