summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2010-11-30 19:13:54 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2010-11-30 19:13:54 +0000
commit72dc402f1fcdf31b83cd172d6502cbae98893195 (patch)
tree7c9e0fb20381e21f353b2684851daa0f7d1015aa /apps
parent1482ba30572835f999a151366fb9a13d854e8888 (diff)
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
Diffstat (limited to 'apps')
-rw-r--r--apps/app_meetme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 66d5317be..89b5bb95f 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>