diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-27 16:11:14 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-27 16:11:14 +0000 |
commit | aabaa74201731b1b6178bf1a63dbe2b26eff7118 (patch) | |
tree | 2e9c8e2cd283e898550c74148d3252afe9eacd1f /configs | |
parent | 2d2c385420340581979e303d701ada367ce7dc3f (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@197090 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/chan_dahdi.conf.sample | 5 | ||||
-rw-r--r-- | configs/extensions.conf.sample | 4 | ||||
-rw-r--r-- | configs/sla.conf.sample | 2 | ||||
-rw-r--r-- | configs/smdi.conf.sample | 4 | ||||
-rw-r--r-- | configs/vpb.conf.sample | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample index 9fd2c9d2d..04434e3b8 100644 --- a/configs/chan_dahdi.conf.sample +++ b/configs/chan_dahdi.conf.sample @@ -670,8 +670,9 @@ pickupgroup=1 ;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 ; diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index b453ad791..7586de65e 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -131,8 +131,8 @@ IAXINFO=guest ; IAXtel username/password 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). diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample index 3ae9dffac..fc8865424 100644 --- a/configs/sla.conf.sample +++ b/configs/sla.conf.sample @@ -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 diff --git a/configs/smdi.conf.sample b/configs/smdi.conf.sample index 464f92134..cca0a5cb9 100644 --- a/configs/smdi.conf.sample +++ b/configs/smdi.conf.sample @@ -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, diff --git a/configs/vpb.conf.sample b/configs/vpb.conf.sample index d1c06e1be..31e5da1ec 100644 --- a/configs/vpb.conf.sample +++ b/configs/vpb.conf.sample @@ -97,8 +97,8 @@ echocancel=off ; ; 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 |