Merged revisions 36253-36254 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r36253 | kpfleming | 2006-06-29 02:19:27 -0500 (Thu, 29 Jun 2006) | 2 lines

add documentation for peer-specific 'outboundproxy' setting

........
r36254 | kpfleming | 2006-06-29 02:19:54 -0500 (Thu, 29 Jun 2006) | 2 lines

clarify documentation for 'persistentmembers' setting

........

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

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index d6d9fa3..86534f5 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
 ;    read into their recorded queues. Default is 'yes'.
 ;
 persistentmembers = yes

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index a91f230..b6ad2dc 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -406,6 +406,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)
@@ -416,14 +417,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
                                ; Call-limits will not be enforced on real-time peers,
                                ; since they are not stored in-memory