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 'yes' is the default.

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@348515 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index e9abacc554a16134761fc524b9d2da28ca2a53c1..0cc29f0b227bbc0adf2c6680739e4710c407c628 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -659,7 +659,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ; However, this is only useful if the external traffic can reach us.
 ; The following settings are allowed (both globally and in individual sections):
 ;
-;        nat = no                ; default. Use NAT mode only according to RFC3581 (;rport)
+;        nat = no                ; Use NAT mode only according to RFC3581 (;rport)
 ;        nat = yes               ; Always ignore info and assume NAT (default)
 ;        nat = never             ; Never attempt NAT mode or RFC3581 support
 ;        nat = route             ; route = Assume NAT, don't send rport 
@@ -670,7 +670,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ; by outside parties as Asterisk will respond to different ports for defined and
 ; undefined peers. For this reason it is recommended to ONLY DEFINE NAT SETTINGS IN THE
 ; GENERAL SECTION. Specifically, if nat=route or nat=yes in one section and nat=no or
-; nat=never in the other, then valid users with settings differing from those in the
+; nat=never in the other, then valid peers with settings differing from those in the
 ; general section will be discoverable.
 
 ;----------------------------------- MEDIA HANDLING --------------------------------