[svn-commits] russell: tag 1.6.0.1 r147460 - in /tags/1.6.0.1: ./ configs/

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Oct  8 07:23:44 2008
New Revision: 147460

URL: http://svn.digium.com/view/asterisk?view=rev&rev=147460
Log:
 - update .version and ChangeLog
 - remove configuration sections from chan_dahdi.conf.sample

Modified:
    tags/1.6.0.1/.version
    tags/1.6.0.1/ChangeLog
    tags/1.6.0.1/configs/chan_dahdi.conf.sample

Modified: tags/1.6.0.1/.version
URL: http://svn.digium.com/view/asterisk/tags/1.6.0.1/.version?view=diff&rev=147460&r1=147459&r2=147460
==============================================================================
--- tags/1.6.0.1/.version (original)
+++ tags/1.6.0.1/.version Wed Oct  8 07:23:44 2008
@@ -1,1 +1,1 @@
-1.6.0
+1.6.0.1

Modified: tags/1.6.0.1/ChangeLog
URL: http://svn.digium.com/view/asterisk/tags/1.6.0.1/ChangeLog?view=diff&rev=147460&r1=147459&r2=147460
==============================================================================
--- tags/1.6.0.1/ChangeLog (original)
+++ tags/1.6.0.1/ChangeLog Wed Oct  8 07:23:44 2008
@@ -1,3 +1,11 @@
+2008-10-08  Russell Bryant <russell at 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 at digium.com>
 
 	* Asterisk 1.6.0 released.

Modified: tags/1.6.0.1/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/tags/1.6.0.1/configs/chan_dahdi.conf.sample?view=diff&rev=147460&r1=147459&r2=147460
==============================================================================
--- tags/1.6.0.1/configs/chan_dahdi.conf.sample (original)
+++ tags/1.6.0.1/configs/chan_dahdi.conf.sample Wed Oct  8 07:23:44 2008
@@ -943,56 +943,3 @@
 ; 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 at mailboxes
-;
-;
-;[fax](phones)
-;dahdichan = 2
-;faxdetect = no
-;context = fax
-;
-;[phone-3](phones)
-;dahdichan = 3
-;pickupgroup = 3,4