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.2@197092 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/chan_dahdi.conf.sample

@@ -710,8 +710,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
 ;
@@ -1144,7 +1145,7 @@ pickupgroup=1
 
 ; 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 @@ pickupgroup=1
 ;
 ; 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 

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

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 

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,

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