Fix a bunch of const stuff, merge queue changes, add experimental "hybrid" DTMF mode

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5293 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 10 insertions, 3 deletions

diff --git a/configs/mgcp.conf.sample b/configs/mgcp.conf.sample
index 2af96c9b3..63e725557 100755
--- a/configs/mgcp.conf.sample
+++ b/configs/mgcp.conf.sample
@@ -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
 
diff --git a/configs/queues.conf.sample b/configs/queues.conf.sample
index 0c3447ffa..983b89dcd 100755
--- a/configs/queues.conf.sample
+++ b/configs/queues.conf.sample
@@ -122,14 +122,21 @@ persistentmembers = yes
 ;
 ; 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)
 ;