diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-09-10 18:58:12 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-09-10 18:58:12 +0000 |
| commit | 9c9acc50e65963fd75cbbd8b51a5cd3ceaf9f208 (patch) | |
| tree | 853be932508806392fae90e975f8dba0e83f2e92 /apps/app_meetme.c | |
| parent | 595cd83d03ba868c9875247cf56271051400199d (diff) | |
app_meetme: Document that 'p' option will continue in dialplan.
(closes issue AST-991)
Reported by John Bigelow
........
Merged revisions 372765 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 372767 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 372768 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 55099dd79..daf947745 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -147,7 +147,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") </option> <option name="p" hasparams="optional"> <para>Allow user to exit the conference by pressing <literal>#</literal> (default) - or any of the defined keys. The key used is set to channel variable + or any of the defined keys. Dial plan execution will continue at the next + priority following MeetMe. The key used is set to channel variable <variable>MEETME_EXIT_KEY</variable>.</para> <argument name="keys" required="true" /> <note> |