]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Update documentation to make it explicit that "stream file" will not restart musiconhold.
authorJoshua Colp <jcolp@digium.com>
Fri, 28 Sep 2012 12:16:40 +0000 (12:16 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 28 Sep 2012 12:16:40 +0000 (12:16 +0000)
(issue ASTERISK-17367)
Reported by: oej
........

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

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

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

res/res_agi.c

index 6f7675f532ee3a69f6cae6cc2726fc5457676ebb..10afbdb690d0da07c521aa1ac2bfaab0b9d8b8ca 100644 (file)
@@ -599,7 +599,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <description>
                        <para>Enables/Disables the music on hold generator. If <replaceable>class</replaceable>
                        is not specified, then the <literal>default</literal> music on hold class will be
-                       used.</para>
+                       used. This generator will be stopped automatically when playing a file.</para>
                        <para>Always returns <literal>0</literal>.</para>
                </description>
        </agi>
@@ -649,7 +649,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Send the given file, allowing playback to be interrupted by the given
                        digits, if any. Returns <literal>0</literal> if playback completes without a digit
                        being pressed, or the ASCII numerical value of the digit if one was pressed,
-                       or <literal>-1</literal> on error or if the channel was disconnected.</para>
+                       or <literal>-1</literal> on error or if the channel was disconnected. If
+                       musiconhold is playing before calling stream file it will be automatically
+                       stopped and will not be restarted after completion.</para>
                </description>
                <see-also>
                        <ref type="agi">control stream file</ref>