From: Jonathan Rose <jrose@digium.com>
Date: Fri, 30 Sep 2011 18:59:01 +0000 (+0000)
Subject: Merged revisions 338719 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1090
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd30e7abc4e70bd8995ec0a4f8096239eb65fb9f;p=thirdparty%2Fasterisk.git

Merged revisions 338719 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338719 | jrose | 2011-09-30 13:55:27 -0500 (Fri, 30 Sep 2011) | 9 lines

  Merged revisions 338718 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r338718 | jrose | 2011-09-30 13:54:30 -0500 (Fri, 30 Sep 2011) | 1 line

    Adds documentation for QueueMemberStatus event generation
  ........
................


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

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index a74c25afcf..ef701ba373 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -470,6 +470,7 @@ monitor-type = MixMonitor
 ; If this is set to yes, the following manager events will be generated:
 ; QueueMemberStatus
 ; (may generate a WHOLE LOT of extra manager events)
+; The default value is yes and this can not be set globally.
 ;
 ; eventmemberstatus = no
 ;