[asterisk-commits] qwell: branch 1.6.1 r213496 - in /branches/1.6.1: ./ configs/queues.conf.sample

[SVN commits to the Asterisk project]

Author: qwell
Date: Fri Aug 21 11:06:12 2009
New Revision: 213496

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213496
Log:
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
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/queues.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/queues.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/configs/queues.conf.sample?view=diff&rev=213496&r1=213495&r2=213496
==============================================================================
--- branches/1.6.1/configs/queues.conf.sample (original)
+++ branches/1.6.1/configs/queues.conf.sample Fri Aug 21 11:06:12 2009
@@ -356,13 +356,13 @@
 ; ----------------------- 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