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 f55acfb5abb7fd8319f42d3494d7bde7449d6734..6c9487a37f8b7f54c0ea8c61acddbc93b5a82b8d 100644 (file)
--- 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>