Copy 1.6.0-rc6 -> 1.6.0

git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0@145555 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 12 insertions, 20 deletions

diff --git a/configs/extensions.lua.sample b/configs/extensions.lua.sample
index 44b9b81b5..8aee734b4 100644
--- a/configs/extensions.lua.sample
+++ b/configs/extensions.lua.sample
@@ -18,6 +18,15 @@ TRUNKMSD = 1
 -- representing a context.  Extensions are defined in each context.  See below
 -- for examples.
 --
+-- This file can be automatically included in the extensions.conf file using
+-- the 'utils/build-extensions-conf.lua' script and a #exec statement in
+-- extensions.conf.
+--
+--   #exec /usr/bin/utils/build-extensions.conf.lua -c
+-- 
+-- The 'execincludes' option must be set to 'yes' in the [options] section of
+-- asterisk.conf for this to work properly.
+-- 
 -- Extension names may be numbers, letters, or combinations thereof. If
 -- an extension name is prefixed by a '_' character, it is interpreted as
 -- a pattern rather than a literal.  In patterns, some characters have
diff --git a/configs/jabber.conf.sample b/configs/jabber.conf.sample
index 6cfb755bd..e817e48d0 100644
--- a/configs/jabber.conf.sample
+++ b/configs/jabber.conf.sample
@@ -1,9 +1,7 @@
 [general]
 ;debug=yes				;;Turn on debugging by default.
-;autoprune=yes				;;Auto remove users from buddy list. Depending on your
-					;;setup (ie, using your personal Gtalk account for a test)
-					;;you might lose your contacts list. Default is 'no'.
-;autoregister=yes			;;Auto register users from buddy list.
+;autoprune=yes				;;Auto remove users from buddy list.
+;autoregister=yes			;;Auto register users from buddy list. 
 
 ;[asterisk]				;;label
 ;type=client				;;Client or Component connection
diff --git a/configs/rtp.conf.sample b/configs/rtp.conf.sample
index f90ed890d..cf3b141c5 100644
--- a/configs/rtp.conf.sample
+++ b/configs/rtp.conf.sample
@@ -22,6 +22,5 @@ rtpend=20000
 			;(min 500, max 60000, default 5000)
 ;
 ; Enable strict RTP protection. This will drop RTP packets that
-; do not come from the source of the RTP stream. This option is
-; disabled by default.
+; do not come from the source of the RTP stream.
 ; strictrtp=yes
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 03206f0b9..c823f4111 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -238,16 +238,6 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
                                 ; your localnet setting. Unless you have some sort of strange network
                                 ; setup you will not need to enable this.
 
-;dynamic_exclude_static = yes   ; Disallow all dynamic hosts from registering
-                                ; as any IP address used for staticly defined
-                                ; hosts.  This helps avoid the configuration
-                                ; error of allowing your users to register at
-                                ; the same address as a SIP provider.
-
-;contactdeny=0.0.0.0/0.0.0.0           ; Use contactpermit and contactdeny to
-;contactpermit=172.16.0.0/255.255.0.0  ; restrict at what IPs your users may
-                                       ; register their phones.
-
 ;
 ; If regcontext is specified, Asterisk will dynamically create and destroy a
 ; NoOp priority 1 extension for a given peer who registers or unregisters with
@@ -731,10 +721,6 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 ;                             timerb
 ;                             qualifyfreq
 ;                             t38pt_usertpsource
-;                             contactpermit         ; Limit what a host may register as (a neat trick
-;                             contactdeny           ; is to register at the same IP as a SIP provider,
-;                                                   ; then call oneself, and get redirected to that
-;                                                   ; same location).
 
 ;[sip_proxy]
 ; For incoming calls only. Example: FWD (Free World Dialup)