Merged revisions 371142 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r371142 | mmichelson | 2012-08-10 16:23:52 -0500 (Fri, 10 Aug 2012) | 18 lines

  Fix a couple of documentation problems in app_queue.c

  * The RemoveQueueMember app made mention of options that could
  be passed in, but no options are supported. I have removed the
  listing of options from the documentation.

  * The RQMSTATUS variable did not list "NOTDYNAMIC" as a possible
  value that could be set.

  (closes issue AST-949)
  reported by Steve Pitts

  (closes issue AST-954)
  reported by Steve Pitts
  ........

  Merged revisions 371141 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................

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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index dd8379448cc5a8c24a5b3b91833ca8ca558b3150..3c486ca12dbf0a625866c1184b44d1f523db84f9 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -304,7 +304,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                <syntax>
                        <parameter name="queuename" required="true" />
                        <parameter name="interface" />
-                       <parameter name="options" />
                </syntax>
                <description>
                        <para>If the interface is <emphasis>NOT</emphasis> in the queue it will return an error.</para>
@@ -314,6 +313,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                                        <value name="REMOVED" />
                                        <value name="NOTINQUEUE" />
                                        <value name="NOSUCHQUEUE" />
+                                       <value name="NOTDYNAMIC" />
                                </variable>
                        </variablelist>
                        <para>Example: RemoveQueueMember(techsupport,SIP/3000)</para>
@@ -5824,12 +5824,11 @@ static int rqm_exec(struct ast_channel *chan, const char *data)
        AST_DECLARE_APP_ARGS(args,
                AST_APP_ARG(queuename);
                AST_APP_ARG(interface);
-               AST_APP_ARG(options);
        );
 
 
        if (ast_strlen_zero(data)) {
-               ast_log(LOG_WARNING, "RemoveQueueMember requires an argument (queuename[,interface[,options]])\n");
+               ast_log(LOG_WARNING, "RemoveQueueMember requires an argument (queuename[,interface])\n");
                return -1;
        }