Merged revisions 198791 via svnmerge from

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

........
  r198791 | file | 2009-06-02 10:48:06 -0300 (Tue, 02 Jun 2009) | 5 lines
  
  Correct documentation for the register line, specifically where the domain should be specified.
  
  (closes issue #14367)
  Reported by: Nick_Lewis
........


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

channels/chan_sip.c

@@ -6280,7 +6280,7 @@ static int sip_register(const char *value, int lineno)
 	if (hostname)
 		*hostname++ = '\0';
 	if (ast_strlen_zero(username) || ast_strlen_zero(hostname)) {
-		ast_log(LOG_WARNING, "Format for registration is [transport://]user[:secret[:authuser]]@domain[:port][/extension] at line %d\n", lineno);
+		ast_log(LOG_WARNING, "Format for registration is [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension] at line %d\n", lineno);
 		return -1;
 	}
 	/* split user[:secret[:authuser]] */

configs/sip.conf.sample

@@ -400,7 +400,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ;----------------------------------------- OUTBOUND SIP REGISTRATIONS  ------------------------
 ; Asterisk can register as a SIP user agent to a SIP proxy (provider)
 ; Format for the register statement is:
-;       register => [transport://]user[:secret[:authuser]]@domain[:port][/extension]
+;       register => [transport://]user[@domain][:secret[:authuser]]@host[:port][/extension]
 ;
 ; 
 ;