Merged revisions 238313 via svnmerge from

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

........
  r238313 | tzafrir | 2010-01-07 11:14:57 +0200 (ה', 07 ינו 2010) | 2 lines

  Document the usefulness of explicit udp:// in the register string
........

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

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 4a3aa358b56e2c731d156965a9c99443dea235b4..e24f47d6312abead97b8ac06a458e22ce27e4fd7 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -520,7 +520,13 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ;    Tip 1: Avoid assigning hostname to a sip.conf section like [provider.com]
 ;    Tip 2: Use separate type=peer and type=user sections for SIP providers
 ;           (instead of type=friend) if you have calls in both directions
-  
+;
+;register => tls://username:xxxxxx@sip-tls-proxy.example.org
+;
+;    The 'transport' part defaults to 'udp' but may also be 'tcp' or 'tls'.
+;    Using 'udp://' explicitly is also useful in case the username part
+;    contains a '/' ('user/name').
+
 ;registertimeout=20             ; retry registration calls every 20 seconds (default)
 ;registerattempts=10            ; Number of registration attempts before we give up
                                 ; 0 = continue forever, hammering the other server