Add a better explanation of the difference between the device namespace and the dialp...

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

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 25bbb7735a105a03abb4fa3af2f67883fb0274e7..c55f71bc6fcd7e754c7da7901c0168c966d93e5d 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -22,6 +22,25 @@
 ;   module reload chan_sip.so     Reload configuration file
 ;                                 Active SIP peers will not be reconfigured
 ;
+;------- Naming devices ------------------------------------------------------
+;
+; When naming devices, make sure you understand how Asterisk matches calls
+; that come in.
+;      1. Asterisk checks the SIP From: address username and matches against
+;         names of devices with type=user 
+;         The name is the text between square brackets [name]
+;      2. Asterisk checks the IP address (and port number) that the INVITE
+;         was sent from and matches against any devices with type=peer
+;
+; Don't mix extensions with the names of the devices. Devices need a unique
+; name. The device name is *not* used as phone numbers. Phone numbers are
+; anything you declare as an extension in the dialplan (extensions.conf).
+;
+; Note: The parameter "username" is not the username and in most cases is
+;       not needed at all. Check below. In later releases, it's renamed
+;       to "defaultuser" which is a better name, since it is used in 
+;       combination with the "defaultip" setting.
+;-----------------------------------------------------------------------------
 
 [general]
 context=default                 ; Default context for incoming calls