Correct two flaws in sip.conf.sample related to AST-2011-013.
authorKevin P. Fleming <kpfleming@digium.com>
Sun, 18 Dec 2011 18:29:47 +0000 (18:29 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sun, 18 Dec 2011 18:29:47 +0000 (18:29 +0000)
commitd30a7ba3ce2903ae7f44ecc292bb7897e101152d
tree806c033fdc00716c051ffdf0a3306f4e1fde5eac
parentbe74e6f16ec133cad88776ee107125aee42ad58f
Correct two flaws in sip.conf.sample related to AST-2011-013.

* The sample file listed *two* values for the 'nat' option as being the default.
  Only 'force_rport' is the default.

* The warning about having differing 'nat' settings confusingly referred to both
  peers and users.
........

Merged revisions 348515 from http://svn.asterisk.org/svn/asterisk/branches/1.6.2
........

Merged revisions 348516 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 348517 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@348518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/sip.conf.sample