Merged revisions 137732 via svnmerge from

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

................
r137732 | russell | 2008-08-14 09:15:50 -0500 (Thu, 14 Aug 2008) | 12 lines

Merged revisions 137731 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137731 | russell | 2008-08-14 09:05:23 -0500 (Thu, 14 Aug 2008) | 4 lines

Comments in this config file were aligned only if your tab size was set to 8.
So, convert tabs to spaces so that things should be aligned regardless of what
tab size you use in your editor.

........

................


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

configs/sip.conf.sample

@@ -48,7 +48,7 @@
 ;
 ;   sip set debug                Show all SIP messages
 ;
-;   sip reload			Reload configuration file
+;   module reload chan_sip.so    Reload configuration file
 ;                                Active SIP peers will not be reconfigured
 ;
 
@@ -208,9 +208,6 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
                                 ; shortinfo : SIP INFO messages (application/dtmf)
                                 ; inband : Inband audio (requires 64 kbit codec -alaw, ulaw)
                                 ; auto : Use rfc2833 if offered, inband otherwise
-
-;compactheaders = yes		; send compact sip headers.
-;
 ;videosupport=yes               ; Turn on support for SIP video. You need to turn this on
                                 ; in the this section to get any video support at all.
                                 ; You can turn it off on a per peer basis if the general
@@ -308,20 +305,6 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
 ;session-minse=90
 ;session-refresher=uas
 ;
-;--------------------------- HASH TABLE SIZES ------------------------------------------------
-; For maximum efficiency, adjust the following
-; values to be slightly larger than the maximum number of in-memory objects (devices).
-; Too large, and space is wasted. Too small, and things will run slower.
-; 563 is probably way too big for small (home) applications, but it
-; should cover most small/medium sites.
-; It is recommended to make the sizes be a prime number!
-; This was internally set to 17 for small-memory applications...
-; All tables default to 563, except when compiled in LOW_MEMORY mode,
-; in which case, they default to 17. You can override this by uncommenting
-; the following, and changing the values.
-;hash_users=563
-;hash_peers=563
-;hash_dialogs=563
 
 ;--------------------------- SIP DEBUGGING ---------------------------------------------------
 ;sipdebug = yes                 ; Turn on SIP debugging by default, from