[asterisk-commits] jrose: trunk r347241 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue Dec  6 16:01:00 2011
New Revision: 347241

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=347241
Log:
Documents CHANNEL(musicclass) taking priority over m([x]) in waitExten

If waitExten specifies a music class to use with its music on hold option, it will use
CHANNEL(musicclass) instead if that channel variable has been set on the initiating
channel.  This documents that behavior in the waitExten app so that this can be known
without checking the documentation of the code in function local_ast_moh_start.

(closes issue ASTERISK-18804)
........

Merged revisions 347239 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 347240 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=347241&r1=347240&r2=347241
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue Dec  6 16:01:00 2011
@@ -671,7 +671,8 @@
 					<option name="m">
 						<para>Provide music on hold to the caller while waiting for an extension.</para>
 						<argument name="x">
-							<para>Specify the class for music on hold.</para>
+							<para>Specify the class for music on hold. <emphasis>CHANNEL(musicclass) will
+							be used instead if set</emphasis></para>
 						</argument>
 					</option>
 				</optionlist>