aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-19 16:21:32 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-19 16:21:32 +0000
commit15e8e47e9b327fb1512363c5f7c9938b4d32d673 (patch)
tree9bcf1ca493e69c4cad428c0a7ff6b32c53f8d7e3 /configs
parentcbe8aea633246d08e99ae2e4636191df30cfb0b3 (diff)
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: http://svn.digium.com/svn/asterisk/trunk@123887 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/sip.conf.sample3
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 9ed00aee2..3879c062d 100644
--- a/configs/sip.conf.sample
+++ b/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.