diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-08 12:23:44 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-08 12:23:44 +0000 |
commit | 37a6dc35fd766bd30672cc0a42146b9be3e1735b (patch) | |
tree | 3b6b6c0660bebb65e094a0fe91b1417385a9307c | |
parent | d4f2b8c11332d3325fff1f0833126f9fbaeee695 (diff) |
- update .version and ChangeLog
- remove configuration sections from chan_dahdi.conf.sample
git-svn-id: http://svn.digium.com/svn/asterisk/tags/1.6.0.1@147460 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | .version | 2 | ||||
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | configs/chan_dahdi.conf.sample | 53 |
3 files changed, 9 insertions, 54 deletions
@@ -1 +1 @@ -1.6.0 +1.6.0.1 @@ -1,3 +1,11 @@ +2008-10-08 Russell Bryant <russell@digium.com> + + * Asterisk 1.6.0.1 released. + + * configs/chan_dahdi.conf.sample: Remove mention of configuration + sections for defining channels in chan_dahdi.conf. This code + is in 1.6.1, and was not merged into 1.6.0. + 2008-10-01 Russell Bryant <russell@digium.com> * Asterisk 1.6.0 released. diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample index b9359de20..0e2096616 100644 --- a/configs/chan_dahdi.conf.sample +++ b/configs/chan_dahdi.conf.sample @@ -943,56 +943,3 @@ pickupgroup=1 ; the doc/ss7.txt file in the Asterisk source tree. ; ----------------- SS7 Options ---------------------------------------- -; Configuration Sections -; ~~~~~~~~~~~~~~~~~~~~~~ -; You can also configure channels in a separate dahdi.conf section. In -; this case the keyword 'channel' is not used. Instead the keyword -; 'dahdichan' is used (as in users.conf) - configuration is only processed -; in a section where the keyword dahdichan is used. It will only be -; processed in the end of the section. Thus the following section: -; -;[phones] -;echocancel = 64 -;dahdichan = 1-8 -;group = 1 -; -; Is somewhat equivalent to the following snippet in the section -; [channels]: -; -;echocancel = 64 -;group = 1 -;channel => 1-8 -; -; When starting a new section almost all of the configuration values are -; copied from their values at the end of the section [channels] in -; dahdi.conf and [general] in users.conf - one section's configuration -; does not affect another one's. -; -; Instead of letting common configuration values "slide through" you can -; use configuration templates to easily keep the common part in one -; place and override where needed. -; -;[phones](!) -;echocancel = yes -;group = 0,4 -;callgroup = 3 -;pickupgroup = 3 -;threewaycalling = yes -;transfer = yes -;context = phones -;faxdetect = incoming -; -;[phone-1](phones) -;dahdichan = 1 -;callerid = My Name <501> -;mailbox = 501@mailboxes -; -; -;[fax](phones) -;dahdichan = 2 -;faxdetect = no -;context = fax -; -;[phone-3](phones) -;dahdichan = 3 -;pickupgroup = 3,4 |