[svn-commits] tilghman: trunk r296788 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Nov 30 13:13:54 2010
New Revision: 296788

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=296788
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=296788&r1=296787&r2=296788
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue Nov 30 13:13:54 2010
@@ -499,7 +499,7 @@
 		</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>