[asterisk-commits] oej: branch 1.6.0 r168717 - in /branches/1.6.0: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Jan 15 12:23:14 2009
New Revision: 168717

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168717
Log:
Merged revisions 168711 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r168711 | oej | 2009-01-15 18:55:53 +0100 (Tor, 15 Jan 2009) | 4 lines

Clarify some misunderstandings and make it even more clear that you can refer to a peer
in the register= line.


........

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

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=168717&r1=168716&r2=168717
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Thu Jan 15 12:23:14 2009
@@ -383,12 +383,16 @@
 ;
 ; 
 ;
+; domain is either 
+;	- domain in DNS
+; 	- host name in DNS
+;	- the name of a peer defined below or in realtime
+; The domain is where you register your username, so your SIP uri you are registering to 
+; is username at domain
+;
 ; If no extension is given, the 's' extension is used. The extension needs to
 ; be defined in extensions.conf to be able to accept calls from this SIP proxy
 ; (provider).
-;
-; host is either a host name defined in DNS or the name of a section defined
-; below.
 ;
 ; A similar effect can be achieved by adding a "callbackextension" option in a peer section.
 ; this is equivalent to having the following line in the general section: