[asterisk-commits] trunk r36262 - in /trunk: ./ configs/queues.conf.sample configs/sip.conf.sample

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jun 29 03:01:08 2006
New Revision: 36262

URL: http://svn.digium.com/view/asterisk?rev=36262&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/configs/queues.conf.sample
    trunk/configs/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/configs/queues.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/queues.conf.sample?rev=36262&r1=36261&r2=36262&view=diff
==============================================================================
--- trunk/configs/queues.conf.sample (original)
+++ trunk/configs/queues.conf.sample Thu Jun 29 03:01:08 2006
@@ -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

Modified: trunk/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/sip.conf.sample?rev=36262&r1=36261&r2=36262&view=diff
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Thu Jun 29 03:01:08 2006
@@ -406,6 +406,7 @@
 ;                             rtptimeout
 ;                             rtpholdtimeout
 ;                             sendrpid
+;                             outboundproxy
 
 ;[sip_proxy]
 ; For incoming calls only. Example: FWD (Free World Dialup)
@@ -416,14 +417,15 @@
 ;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