From: Joshua Colp <jcolp@digium.com>
Date: Wed, 27 Jun 2007 23:26:46 +0000 (+0000)
Subject: Merged revisions 72381 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=150c77c901fe58defa657d9b11b4bf48b38a5586;p=thirdparty%2Fasterisk.git

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

................
r72381 | file | 2007-06-27 19:25:12 -0400 (Wed, 27 Jun 2007) | 10 lines

Merged revisions 72378 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r72378 | file | 2007-06-27 19:24:01 -0400 (Wed, 27 Jun 2007) | 2 lines

Update documentation to clarify variable usage with MixMonitor. (issue #9494 reported by netoguy)

........

................


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

diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 4ca27bdf7d..e24f62fdbc 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -75,8 +75,8 @@ static const char *desc = ""
 " W(<x>) - Adjust the both heard and spoken volumes by a factor of <x>\n"
 "         (range -4 to 4)\n\n"	
 "<command> will be executed when the recording is over\n"
-"Any strings matching ^{X} will be unescaped to ${X} and \n"
-"all variables will be evaluated at that time.\n"
+"Any strings matching ^{X} will be unescaped to ${X}.\n"
+"All variables will be evaluated at the time MixMonitor is called.\n"
 "The variable MIXMONITOR_FILENAME will contain the filename used to record.\n"
 "";