summaryrefslogtreecommitdiff
path: root/configs/sip.conf.sample
diff options
context:
space:
mode:
authorOlle Johansson <oej@edvina.net>2006-01-24 18:15:20 +0000
committerOlle Johansson <oej@edvina.net>2006-01-24 18:15:20 +0000
commit0ba27e0a6b0a6fd9b22d078548462d2872f92b99 (patch)
tree7bc47931ae4a5f8a8764a0950515364295ae0420 /configs/sip.conf.sample
parent293d88108f1bd313f377da6279a41eb60baa152a (diff)
Make it clear that caller ID in sip.conf is used only on incoming calls (inspired by bug #6183)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/sip.conf.sample')
-rw-r--r--configs/sip.conf.sample1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 7a671b996..da63b4d5e 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -342,6 +342,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;type=friend
;context=from-sip ; Where to start in the dialplan when this phone calls
;callerid=John Doe <1234> ; Full caller ID, to override the phones config
+ ; on incoming calls to Asterisk
;host=192.168.0.23 ; we have a static but private IP address
; No registration allowed
;nat=no ; there is not NAT between phone and Asterisk