diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-19 16:22:10 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-19 16:22:10 +0000 |
| commit | d0fdee56bccf185a67c52eb8a7934ff68ca5012e (patch) | |
| tree | 63cb9701cb431ae09de154563ff3db7099bc22b1 /configs | |
| parent | 22d130ff523806129121f13fa8fb0b0dbf1cef89 (diff) | |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123891 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sip.conf.sample | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index da7c94cb3..4fb600c3d 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -340,7 +340,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. |