aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-29 08:04:58 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-29 08:04:58 +0000
commit4364ad9885a12a83ea4545ce5f979e1ae12dbb36 (patch)
tree13670d3d59a49e58700fd9781deacbb328abd4bc
parentb44dd44bfaf2b5f7cc057c3b816ede524a21ca7a (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@36283 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--configs/queues.conf.sample4
-rw-r--r--configs/sip.conf.sample12
2 files changed, 9 insertions, 7 deletions
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index ba7a082b5..c967313e9 100644
--- 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 9e2d63328..7cf083761 100644
--- 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