From: Jason Parker <jparker@digium.com>
Date: Fri, 21 Aug 2009 16:06:12 +0000 (+0000)
Subject: Merged revisions 213494 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bd918db028c8a12b0b448fa48343bab4f158a5f;p=thirdparty%2Fasterisk.git

Merged revisions 213494 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r213494 | qwell | 2009-08-21 11:04:21 -0500 (Fri, 21 Aug 2009) | 12 lines

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

  ........
    r213493 | qwell | 2009-08-21 11:03:21 -0500 (Fri, 21 Aug 2009) | 5 lines

    Clarify queues.conf comments to specify that variables should be set in the dialplan.

    (closes issue #15755)
    Reported by: trendboy
  ........
................


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

diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index d792a99e01..1c53ce2f0b 100644
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -356,13 +356,13 @@ shared_lastcall=no
 ; ----------------------- TYPE MIXMONITOR OPTIONS -----------------------------
 ;
 ;
-; You can specify the options supplied to MixMonitor by calling
+; You can specify the options supplied to MixMonitor by calling (from the dialplan)
 ;   Set(MONITOR_OPTIONS=av(<x>)V(<x>)W(<x>))
 ; The 'b' option for MixMonitor (only save audio to the file while bridged) is 
 ; implied.
 ;
 ; You can specify a post recording command to be executed after the end of
-; recording by calling
+; recording by calling (from the dialplan)
 ;   Set(MONITOR_EXEC=mv /var/spool/asterisk/monitor/^{MONITOR_FILENAME} /tmp/^{MONITOR_FILENAME})
 ;
 ; The command specified within the contents of MONITOR_EXEC will be executed when