]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Documents CHANNEL(musicclass) taking priority over m([x]) in waitExten
authorJonathan Rose <jrose@digium.com>
Tue, 6 Dec 2011 21:44:26 +0000 (21:44 +0000)
committerJonathan Rose <jrose@digium.com>
Tue, 6 Dec 2011 21:44:26 +0000 (21:44 +0000)
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)

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

main/pbx.c

index f1dbc95f2fb26ac3329fea15e26ab30bb34761ee..db0bea4c7d9aecefd728dd99949f9b0514653507 100644 (file)
@@ -671,7 +671,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        <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>