aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-21 18:06:47 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2011-07-21 18:06:47 +0000
commitdc502a7e5824fe158f7ef3b168724ca30c4360c2 (patch)
tree44d014727e86942e3d2727e9821709fa8a10dfbe /configs
parent42df093d7a08aaab59f8a0cc5f73456d45fa3f9d (diff)
Merged revisions 329204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10 ................ r329204 | rmudgett | 2011-07-21 13:05:18 -0500 (Thu, 21 Jul 2011) | 13 lines Merged revisions 329203 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r329203 | rmudgett | 2011-07-21 13:04:09 -0500 (Thu, 21 Jul 2011) | 6 lines Document parkinglot in chan_dahdi.conf.sample. * Document existing feature in chan_dahdi.conf.sample. * Remove some dead code related to the parkinglot option. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@329205 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/chan_dahdi.conf.sample7
1 files changed, 7 insertions, 0 deletions
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 16269dc..b7f59f7 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -664,6 +664,13 @@ transfer=yes
; ('canpark=no' is overridden by 'transfer=yes')
;
canpark=yes
+
+; Sets the default parking lot for call parking.
+; This is setable per channel.
+; Parkinglots are configured in features.conf
+;
+;parkinglot=plaza
+
;
; Support call forward variable
;