[svn-commits] tilghman: branch 1.6.0 r125228 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jun 25 20:26:29 2008
New Revision: 125228

URL: http://svn.digium.com/view/asterisk?view=rev&rev=125228
Log:
Merged revisions 125223 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r125223 | tilghman | 2008-06-25 20:25:16 -0500 (Wed, 25 Jun 2008) | 12 lines

Merged revisions 125218 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r125218 | tilghman | 2008-06-25 20:24:26 -0500 (Wed, 25 Jun 2008) | 4 lines

Document ackcall=always.
(closes issue #12852)
 Reported by: davidw

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/agents.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/agents.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/agents.conf.sample?view=diff&rev=125228&r1=125227&r2=125228
==============================================================================
--- branches/1.6.0/configs/agents.conf.sample (original)
+++ branches/1.6.0/configs/agents.conf.sample Wed Jun 25 20:26:29 2008
@@ -38,6 +38,8 @@
 ;
 ; Define ackcall to require an acknowledgement by '#' when
 ; an agent logs in using agentcallbacklogin.  Default is "no".
+; Can also be set to "always", which will also require AgentLogin
+; agents to acknowledge calls by pressing '#'.
 ;
 ;ackcall=no
 ;