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

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/sip.conf.sample

@@ -359,7 +359,8 @@ srvlookup=yes			; Enable DNS SRV lookups on outbound calls
 ;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.