From: Olle Johansson Date: Tue, 24 Jan 2006 18:15:20 +0000 (+0000) Subject: Make it clear that caller ID in sip.conf is used only on incoming calls (inspired... X-Git-Tag: 1.4.0-beta1~2818 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ba27e0a6b0a6fd9b22d078548462d2872f92b99;p=thirdparty%2Fasterisk.git 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 --- diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 7a671b9962..da63b4d5e3 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