From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 30 Nov 2010 19:13:54 +0000 (+0000)
Subject: Merged revisions 296787 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2085
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72dc402f1fcdf31b83cd172d6502cbae98893195;p=thirdparty%2Fasterisk.git

Merged revisions 296787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296787 | tilghman | 2010-11-30 13:12:48 -0600 (Tue, 30 Nov 2010) | 2 lines

  DOC: Conference number can be omitted; if omitted, all users in a meetme are listed.
........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 66d5317be1..89b5bb95f7 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -499,7 +499,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		</synopsis>
 		<syntax>
 			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
-			<parameter name="Conference" required="true">
+			<parameter name="Conference" required="false">
 				<para>Conference number.</para>
 			</parameter>
 		</syntax>