diff options
| author | Jonathan Rose <jrose@digium.com> | 2011-09-19 20:23:29 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2011-09-19 20:23:29 +0000 |
| commit | 364eb5683575df3a72302f5494a36fd55690e1c9 (patch) | |
| tree | f5e0811e47a6bf9722a4af485fb929867063ba03 /res | |
| parent | 5c71a502a7c318d7efd33d8cb2f348fb710940e3 (diff) | |
Merged revisions 336717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10
................
r336717 | jrose | 2011-09-19 15:16:23 -0500 (Mon, 19 Sep 2011) | 14 lines
Merged revisions 336716 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r336716 | jrose | 2011-09-19 15:07:36 -0500 (Mon, 19 Sep 2011) | 7 lines
Document applications that play audio and do not answer unanswered calls.
This patch is part of an effort to document early media and its usage. If you are
interested in contributing to this documentation effort, there are probably other
applications worth documenting as well as an Asterisk wiki article at
https://wiki.asterisk.org/wiki/display/AST/Early+Media+and+the+Progress+Application
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index bc3d2f343..77beb55fa 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -86,6 +86,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") Set(CHANNEL(musicclass)=...). If duration is given, hold music will be played specified number of seconds. If duration is ommited, music plays indefinitely. Returns <literal>0</literal> when done, <literal>-1</literal> on hangup.</para> + <para>This application does not automatically answer and should be preceeded by + an application such as Answer() or Progress().</para> </description> </application> <application name="WaitMusicOnHold" language="en_US"> |