[Asterisk-cvs] asterisk/configs mgcp.conf.sample, 1.9, 1.10 queues.conf.sample, 1.24, 1.25

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/configs
In directory mongoose.digium.com:/tmp/cvs-serv4791/configs

Modified Files:
	mgcp.conf.sample queues.conf.sample 
Log Message:
Fix a bunch of const stuff, merge queue changes, add experimental "hybrid" DTMF mode


Index: mgcp.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/mgcp.conf.sample,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mgcp.conf.sample	2 Aug 2004 04:32:37 -0000	1.9
+++ mgcp.conf.sample	28 Mar 2005 20:48:24 -0000	1.10
@@ -45,7 +45,7 @@
 ;
 ;context=local
 ;host=dynamic
-;dtmfmode=none		; DTMF Mode can be 'none', 'rfc2833', or 'inband'.  Default is none.
+;dtmfmode=none		; DTMF Mode can be 'none', 'rfc2833', or 'inband' or 'hybrid' which starts in none and moves to inband.  Default is none.
 ;slowsequence=yes	; The DPH100M does not follow MGCP standards for sequencing
 ;line => aaln/1
 

Index: queues.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/queues.conf.sample,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- queues.conf.sample	4 Mar 2005 00:59:58 -0000	1.24
+++ queues.conf.sample	28 Mar 2005 20:48:24 -0000	1.25
@@ -122,14 +122,21 @@
 ;
 ; monitor-join = yes
 ;
-; If you wish to allow queues that have no members currently to be joined, set this to yes
+; This setting controls whether callers can join a queue with no members. There are three
+; choices:
+;
+; yes - callers can join a queue with no members or only unavailable members
+; no - callers cannot join a queue with no members or only unavailable members
+; strict - callers cannot join a queue with no members
 ;
 ; joinempty = yes
 ;
-; If you wish to remove callers from the queue if there are no agents present, set this to yes
+; If you wish to remove callers from the queue when new callers cannot join, set this setting
+; to one of the same choices for 'joinwhenempty'
 ;
 ; leavewhenempty = yes
 ;
+;
 ; Asterisk can generate AgentCalled events when an agent is rung, if this is turned on
 ; (may generate a LOT of extra manager events)
 ;