Merged revisions 126845 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r126845 | oej | 2008-07-01 14:54:57 +0200 (Tis, 01 Jul 2008) | 14 lines


Merged revisions 126844 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r126844 | oej | 2008-07-01 14:53:01 +0200 (Tis, 01 Jul 2008) | 5 lines

Clear up documentation on "domain=" setting in sip.conf

Reported by: davidw
(closes issue #12413)

........

................


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

configs/sip.conf.sample

@@ -127,10 +127,6 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
 				; ability to place SIP calls based on domain 
 				; names to some other SIP users on the Internet
 				
-;domain=mydomain.tld		; Set default domain for this host
-				; If configured, Asterisk will only allow
-				; INVITE and REFER to non-local domains
-				; Use "sip show domains" to list local domains
 ;pedantic=yes			; Enable checking of tags in headers, 
 				; international character conversions in URIs
 				; and multiline formatted headers for strict
@@ -580,6 +576,9 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
 ; domains, each of which can direct the call to a specific context if desired.
 ; By default, all domains are accepted and sent to the default context or the
 ; context associated with the user/peer placing the call.
+; REGISTER to non-local domains will be automatically denied if a domain
+; list is configured.
+;
 ; Domains can be specified using:
 ; domain=<domain>[,<context>]
 ; Examples: