[svn-commits] wdoekes: trunk r381670 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Mon Feb 18 14:31:56 2013
New Revision: 381670

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381670
Log:
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

Modified:
    trunk/   (props changed)
    trunk/configs/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=381670&r1=381669&r2=381670
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Mon Feb 18 14:31:56 2013
@@ -457,7 +457,7 @@
                                        ; 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 @@
 ; outboundproxy
 ; rfc2833compensate
 ; callbackextension
-; registertrying
 ; timert1
 ; timerb
 ; qualifyfreq