Merged revisions 36253-36254 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Thu, 29 Jun 2006 08:01:08 +0000 (08:01 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Thu, 29 Jun 2006 08:01:08 +0000 (08:01 +0000)
commitdec3d7d4c0ca0cc08c4ed618e325a070bb6851e5
tree8e8c3f80c84d32ff50be103b6107fa4bf93fa1e1
parenta38e7f01a92adea85e5e7a4170223278d41c7945
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
configs/queues.conf.sample
configs/sip.conf.sample