Merged revisions 36253-36254 via svnmerge from
commit712fac429d6e6477e1c672c73a494982874ea485
authorkpfleming <kpfleming@614ede4d-c843-0410-af14-a771ab80d22e>
Thu, 29 Jun 2006 08:01:08 +0000 (29 08:01 +0000)
committerkpfleming <kpfleming@614ede4d-c843-0410-af14-a771ab80d22e>
Thu, 29 Jun 2006 08:01:08 +0000 (29 08:01 +0000)
tree8e8c3f80c84d32ff50be103b6107fa4bf93fa1e1
parent9fb9cffd60a640d726203c177a0a48133b56b129
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: http://svn.digium.com/svn/asterisk/trunk@36262 614ede4d-c843-0410-af14-a771ab80d22e
configs/queues.conf.sample
configs/sip.conf.sample