[svn-commits] tilghman: branch 1.6.0 r123891 - in /branches/1.6.0: ./ configs/sip.conf.sample

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jun 19 11:22:10 2008
New Revision: 123891

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123891
Log:
Merged revisions 123887 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r123887 | tilghman | 2008-06-19 11:21:32 -0500 (Thu, 19 Jun 2008) | 12 lines

Merged revisions 123883 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r123883 | tilghman | 2008-06-19 11:20:41 -0500 (Thu, 19 Jun 2008) | 4 lines

Correct description of notifyringing option.
(Closes issue #12890)
Reported by gminet

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/sip.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=123891&r1=123890&r2=123891
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Thu Jun 19 11:22:10 2008
@@ -340,7 +340,8 @@
 ;subscribecontext = default	; Set a specific context for SUBSCRIBE requests
 				; Useful to limit subscriptions to local extensions
 				; Settable per peer/user also
-;notifyringing = yes		; Notify subscriptions on RINGING state (default: no)
+;notifyringing = yes           ; Control whether subscriptions already INUSE get sent
+                               ; RINGING when another call is sent (default: no)
 ;notifyhold = yes		; Notify subscriptions on HOLD state (default: no)
 				; Turning on notifyringing and notifyhold will add a lot
 				; more database transactions if you are using realtime.