diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index c365b01853..d169cc22d5 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -49,6 +49,25 @@
 ;
 ;   module reload chan_sip.so    Reload configuration file
 ;
+;------- 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.
+;-----------------------------------------------------------------------------
 
 ; ** Deprecated configuration options **
 ; The "call-limit" configuation option is deprecated. It still works in