From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Thu, 17 Jun 2010 00:32:06 +0000 (+0000)
Subject: Merged revisions 271089 via svnmerge from
X-Git-Tag: 1.6.2.10-rc1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b22456daf07694950ee4b054235771898c73b9f;p=thirdparty%2Fasterisk.git

Merged revisions 271089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r271089 | pabelanger | 2010-06-16 20:30:51 -0400 (Wed, 16 Jun 2010) | 5 lines

  option w[(secs)] incorrectly capitalized in xmldoc

  (closes issue #17516)
  Reported by: karlfife
........


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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f55acfb5ab..6c9487a37f 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -160,7 +160,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 					<option name="T">
 						<para>Set talker detection (sent to manager interface and meetme list).</para>
 					</option>
-					<option name="W" hasparams="optional">
+					<option name="w" hasparams="optional">
 						<para>Wait until the marked user enters the conference.</para>
 						<argument name="secs" required="true" />
 					</option>