[svn-commits] seanbright: branch 1.6.2 r197092 - in /branches/1.6.2: ./ configs/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed May 27 11:12:50 CDT 2009
Author: seanbright
Date: Wed May 27 11:12:47 2009
New Revision: 197092
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197092
Log:
Merged revisions 197089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r197089 | seanbright | 2009-05-27 12:07:57 -0400 (Wed, 27 May 2009) | 6 lines
Fix references to /etc/dahdi/system.conf and /etc/asterisk/chan_dahdi.conf in
the sample configuration files.
(closes issue #15207)
Reported by: seandarcy
........
Modified:
branches/1.6.2/ (props changed)
branches/1.6.2/configs/chan_dahdi.conf.sample
branches/1.6.2/configs/extensions.conf.sample
branches/1.6.2/configs/sla.conf.sample
branches/1.6.2/configs/smdi.conf.sample
branches/1.6.2/configs/vpb.conf.sample
Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.2/configs/chan_dahdi.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/chan_dahdi.conf.sample?view=diff&rev=197092&r1=197091&r2=197092
==============================================================================
--- branches/1.6.2/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.2/configs/chan_dahdi.conf.sample Wed May 27 11:12:47 2009
@@ -710,8 +710,9 @@
;progzone=uk
;
; Set the tonezone. Equivalent of the defaultzone settings in
-; /etc/dahdi.conf . This sets the tone zone by number.
-; Note that you'd still need to load tonezones (loadzone in dahdi.conf).
+; /etc/dahdi/system.conf. This sets the tone zone by number.
+; Note that you'd still need to load tonezones (loadzone in
+; /etc/dahdi/system.conf).
; The default is -1: not to set anything.
;tonezone = 0 ; 0 is US
;
@@ -1144,7 +1145,7 @@
; Configuration Sections
; ~~~~~~~~~~~~~~~~~~~~~~
-; You can also configure channels in a separate dahdi.conf section. In
+; You can also configure channels in a separate chan_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
@@ -1164,7 +1165,7 @@
;
; 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
+; chan_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
Modified: branches/1.6.2/configs/extensions.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/extensions.conf.sample?view=diff&rev=197092&r1=197091&r2=197092
==============================================================================
--- branches/1.6.2/configs/extensions.conf.sample (original)
+++ branches/1.6.2/configs/extensions.conf.sample Wed May 27 11:12:47 2009
@@ -131,8 +131,8 @@
TRUNK=DAHDI/G2 ; Trunk interface
;
; Note the 'G2' in the TRUNK variable above. It specifies which group (defined
-; in dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in
-; the specified group. The four possible options are:
+; in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use
+; in the specified group. The four possible options are:
;
; g: select the lowest-numbered non-busy DAHDI channel
; (aka. ascending sequential hunt group).
Modified: branches/1.6.2/configs/sla.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/sla.conf.sample?view=diff&rev=197092&r1=197091&r2=197092
==============================================================================
--- branches/1.6.2/configs/sla.conf.sample (original)
+++ branches/1.6.2/configs/sla.conf.sample Wed May 27 11:12:47 2009
@@ -29,7 +29,7 @@
;autocontext=line1 ; This supports automatic generation of the dialplan entries
; if the autocontext option is used. Each trunk should have
- ; a unique context name. Then, in dahdi.conf, this device
+ ; a unique context name. Then, in chan_dahdi.conf, this device
; should be configured to have incoming calls go to this context.
;ringtimeout=30 ; Set how long to allow this trunk to ring on an inbound call before hanging
Modified: branches/1.6.2/configs/smdi.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/smdi.conf.sample?view=diff&rev=197092&r1=197091&r2=197092
==============================================================================
--- branches/1.6.2/configs/smdi.conf.sample (original)
+++ branches/1.6.2/configs/smdi.conf.sample Wed May 27 11:12:47 2009
@@ -2,8 +2,8 @@
[interfaces]
; Specify serial ports to listen for SMDI messages on below. These will be
-; referenced later in dahdi.conf. If you do not specify any interfaces then
-; SMDI will be disabled. Interfaces can have several different attributes
+; referenced later in chan_dahdi.conf. If you do not specify any interfaces
+; then SMDI will be disabled. Interfaces can have several different attributes
; associated with them.
; Set the number of stop bits to use per character here. The default is no,
Modified: branches/1.6.2/configs/vpb.conf.sample
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/configs/vpb.conf.sample?view=diff&rev=197092&r1=197091&r2=197092
==============================================================================
--- branches/1.6.2/configs/vpb.conf.sample (original)
+++ branches/1.6.2/configs/vpb.conf.sample Wed May 27 11:12:47 2009
@@ -97,8 +97,8 @@
;
; NOTE that other caller ID standards are supported in Asterisk, but are
; not yet active in chan_vpb. It should be reasonably trivial to add
-; support for the other standards (see the default dahdi.conf for a list
-; of them) that Asterisk already handles.
+; support for the other standards (see the default chan_dahdi.conf for a
+; list of them) that Asterisk already handles.
;
callerid=bell
More information about the svn-commits
mailing list