Merged revisions 371783,371789 via svnmerge from

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

................
  r371783 | mmichelson | 2012-08-27 16:29:29 -0500 (Mon, 27 Aug 2012) | 9 lines

  Fix incorrect documentation of the MailboxStatus manager command.

  The "Waiting" field was misdocumented as reporting the number of
  messages waiting. In reality, it simply indicated the presence or
  absence of waiting messages.
  ........

  Merged revisions 371782 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r371789 | mmichelson | 2012-08-27 16:49:51 -0500 (Mon, 27 Aug 2012) | 13 lines

  Fix misleading documentation in agents.conf.sample regarding ackcall usage.

  The documentation made it sound as if the DTMF acknowledgment was needed
  at the time the agent logs in, rather than when the agent is called. This
  is likely a relic from the days when there were multiple ways of logging
  in agents.

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

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

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

diff --git a/configs/agents.conf.sample b/configs/agents.conf.sample
index 3a9255adac478b1086bbf95fd3cb47014719520a..c92872198b5250900ffdcbff4161d5ed6733415c 100644 (file)
--- a/configs/agents.conf.sample
+++ b/configs/agents.conf.sample
@@ -30,7 +30,7 @@
 ;autologoffunavail=yes
 ;
 ; Define ackcall to require a DTMF acknowledgement when
-; an agent logs in using AgentLogin.  Default is "no".
+; a logged-in agent receives a call.  Default is "no".
 ; Use the acceptdtmf option to configure what DTMF key
 ; press should be used to acknowledge the call. The
 ; default is '#'.

diff --git a/main/manager.c b/main/manager.c
index 12c76a33a2dc8c7c6479729f471b47c2e663dd21..5f753587fe26a75618938292a830ed963906d631 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -541,7 +541,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        <para>Returns number of messages.</para>
                        <para>Message: Mailbox Status.</para>
                        <para>Mailbox: <replaceable>mailboxid</replaceable>.</para>
-                       <para>Waiting: <replaceable>count</replaceable>.</para>
+                       <para>Waiting: <literal>0</literal> if messages waiting, <literal>1</literal>
+                       if no messages waiting.</para>
                </description>
        </manager>
        <manager name="MailboxCount" language="en_US">