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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-05-27 16:11:14 +00:00
parent 7fe3f9692a
commit 9654401867
5 changed files with 10 additions and 9 deletions

View File

@@ -670,8 +670,9 @@ pickupgroup=1
;progzone=uk ;progzone=uk
; ;
; Set the tonezone. Equivalent of the defaultzone settings in ; Set the tonezone. Equivalent of the defaultzone settings in
; /etc/dahdi.conf . This sets the tone zone by number. ; /etc/dahdi/system.conf. This sets the tone zone by number.
; Note that you'd still need to load tonezones (loadzone in dahdi.conf). ; Note that you'd still need to load tonezones (loadzone in
; /etc/dahdi/system.conf).
; The default is -1: not to set anything. ; The default is -1: not to set anything.
;tonezone = 0 ; 0 is US ;tonezone = 0 ; 0 is US
; ;

View File

@@ -131,8 +131,8 @@ IAXINFO=guest ; IAXtel username/password
TRUNK=DAHDI/G2 ; Trunk interface TRUNK=DAHDI/G2 ; Trunk interface
; ;
; Note the 'G2' in the TRUNK variable above. It specifies which group (defined ; 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 ; in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use
; the specified group. The four possible options are: ; in the specified group. The four possible options are:
; ;
; g: select the lowest-numbered non-busy DAHDI channel ; g: select the lowest-numbered non-busy DAHDI channel
; (aka. ascending sequential hunt group). ; (aka. ascending sequential hunt group).

View File

@@ -29,7 +29,7 @@
;autocontext=line1 ; This supports automatic generation of the dialplan entries ;autocontext=line1 ; This supports automatic generation of the dialplan entries
; if the autocontext option is used. Each trunk should have ; 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. ; 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 ;ringtimeout=30 ; Set how long to allow this trunk to ring on an inbound call before hanging

View File

@@ -2,8 +2,8 @@
[interfaces] [interfaces]
; Specify serial ports to listen for SMDI messages on below. These will be ; 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 ; referenced later in chan_dahdi.conf. If you do not specify any interfaces
; SMDI will be disabled. Interfaces can have several different attributes ; then SMDI will be disabled. Interfaces can have several different attributes
; associated with them. ; associated with them.
; Set the number of stop bits to use per character here. The default is no, ; Set the number of stop bits to use per character here. The default is no,

View File

@@ -97,8 +97,8 @@ echocancel=off
; ;
; NOTE that other caller ID standards are supported in Asterisk, but are ; 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 ; 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 ; support for the other standards (see the default chan_dahdi.conf for a
; of them) that Asterisk already handles. ; list of them) that Asterisk already handles.
; ;
callerid=bell callerid=bell