aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-09 18:11:57 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-09 18:11:57 +0000
commit5bcc97fce3517163dc95e9b042840dd60190aeef (patch)
treef7b476c2756e143a940c4ecff2bad2099fd9b3de
parent563497e27cb0b42f2c4d6a37823f78988e24a928 (diff)
Merged revisions 275147 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r275147 | russell | 2010-07-09 13:11:13 -0500 (Fri, 09 Jul 2010) | 2 lines Move parking lot sample config out from the middle of dynamic features sample config. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@275148 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--configs/features.conf.sample21
1 files changed, 11 insertions, 10 deletions
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 6186f0a39..9d6fa43d6 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -52,6 +52,17 @@ context => parkedcalls ; Which context parked calls are in (default parking lot
;atxfercallbackretries = 2 ; Number of times to attempt to send the call back to the transferer.
; By default, this is 2.
+;
+;*** Define another parking lot
+;
+; You can set parkinglot with the CHANNEL dialplan function
+; or by setting 'parkinglot' directly in the channel configuration file.
+;
+;[parkinglot_edvina]
+;context => edvinapark
+;parkpos => 800-850
+;findslot => next
+
; Note that the DTMF features listed below only work when two channels have answered and are bridged together.
; They can not be used while the remote party is ringing or in progress. If you require this feature you can use
; chan_local in combination with Answer to accomplish it.
@@ -127,16 +138,6 @@ context => parkedcalls ; Which context parked calls are in (default parking lot
; ;on their channel
;unpauseMonitor => #3,self/callee,UnPauseMonitor ;Allow the callee to unpause monitoring
; ;on their channel
-;
-;*** Define another parking lot
-;
-; You can set parkinglot with the CHANNEL dialplan function
-; or by setting 'parkinglot' directly in the channel configuration file.
-;
-;[parkinglot_edvina]
-;context => edvinapark
-;parkpos => 800-850
-;findslot => next
; GROUPS
; Groups are groupings of features defined in [applicationmap]