[Asterisk-cvs] asterisk/configs sip.conf.sample,1.54,1.55

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/configs
In directory mongoose.digium.com:/tmp/cvs-serv26826/configs

Modified Files:
	sip.conf.sample 
Log Message:
Merge callevents etc (bug #3456)


Index: sip.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/sip.conf.sample,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- sip.conf.sample	11 Jan 2005 18:39:48 -0000	1.54
+++ sip.conf.sample	29 Jan 2005 23:19:01 -0000	1.55
@@ -118,6 +118,7 @@
 ;               (instead of type=friend) if you have calls in both directions
   
 ;registertimeout=20		; retry registration calls every 20 seconds (default)
+;callevents=no			; generate manager events when sip ua performs events (e.g. hold)
 
 ;---------------------------------------------- NAT SUPPORT ------------------------
 ; The externip, externhost and localnet settings are used if you use Asterisk behind