diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2013-02-18 20:31:56 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2013-02-18 20:31:56 +0000 |
| commit | d4d1d10307c317bbe36ac33ef6b5836ca27776f3 (patch) | |
| tree | 418cc945c7ef5891d0cd98c1b1459acc61fb2bde /configs | |
| parent | d7a616c945a7e02f292bf60fd60de0f6dea06601 (diff) | |
Remove "registertrying" and add "rtp_engine" from/to sip.conf.sample
The "registertrying" option was removed in r343220. The "rtp_engine"
option was added in r186078 but erroneously named "engine" in the sample.
Note that there is no global sip setting for a different engine.
........
Merged revisions 381668 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 381669 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@381670 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sip.conf.sample | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 90b8abe5f..d54398c44 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -457,7 +457,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; register their phones. ;contactacl=named_acl_example ; Use named ACLs defined in acl.conf -;engine=asterisk ; RTP engine to use when communicating with the device +;rtp_engine=asterisk ; RTP engine to use when communicating with the device ; ; If regcontext is specified, Asterisk will dynamically create and destroy a @@ -1233,7 +1233,6 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; outboundproxy ; rfc2833compensate ; callbackextension -; registertrying ; timert1 ; timerb ; qualifyfreq |