automerge commit

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

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index ba7a082b539eaae8d634561e216447097064a7df..c967313e9c9dfe3d4774e74135bc9e8a220638f1 100644 (file)
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -3,8 +3,8 @@
 ; Global settings for call queues
 ;
 ; Persistent Members
-;    Store each dynamic agent in each queue in the astdb so that
-;    when asterisk is restarted, each agent will be automatically
+;    Store each dynamic member in each queue in the astdb so that
+;    when asterisk is restarted, each member will be automatically
 ;    readded into their recorded queues. Default is 'yes'.
 ;
 persistentmembers = yes

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 9e2d63328154a375d9345e4c493739ec831a5f3c..7cf083761cd8fe56b6de69d7d69761a3a77d491c 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -308,6 +308,7 @@ srvlookup=yes                       ; Enable DNS SRV lookups on outbound calls
 ;                             rtptimeout
 ;                             rtpholdtimeout
 ;                             sendrpid
+;                             outboundproxy
 
 ;[sip_proxy]
 ; For incoming calls only. Example: FWD (Free World Dialup)
@@ -318,14 +319,15 @@ srvlookup=yes                     ; Enable DNS SRV lookups on outbound calls
 ;host=fwd.pulver.com
 
 ;[sip_proxy-out]
-;type=peer                     ; we only want to call out, not be called
+;type=peer                             ; we only want to call out, not be called
 ;secret=guessit
-;username=yourusername         ; Authentication user for outbound proxies
-;fromuser=yourusername         ; Many SIP providers require this!
+;username=yourusername                 ; Authentication user for outbound proxies
+;fromuser=yourusername                 ; Many SIP providers require this!
 ;fromdomain=provider.sip.domain        
 ;host=box.provider.com
-;usereqphone=yes               ; This provider requires ";user=phone" on URI
-;call-limit=5                  ; permit only 5 simultaneous outgoing calls to this peer
+;usereqphone=yes                       ; This provider requires ";user=phone" on URI
+;call-limit=5                          ; permit only 5 simultaneous outgoing calls to this peer
+;outboundproxy=proxy.provider.domain   ; send outbound signaling to this proxy, not directly to the peer
 
 ;------------------------------------------------------------------------------
 ; Definitions of locally connected SIP phones