From: Jonathan Rose <jrose@digium.com>
Date: Mon, 10 Sep 2012 18:58:12 +0000 (+0000)
Subject: app_meetme: Document that 'p' option will continue in dialplan.
X-Git-Tag: 13.0.0-beta1~2555
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c9acc50e65963fd75cbbd8b51a5cd3ceaf9f208;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 55099dd790..daf9477457 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>