Merged revisions 130044 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r130044 | kpfleming | 2008-07-11 11:18:01 -0500 (Fri, 11 Jul 2008) | 2 lines

clean up a bunch more Zaptel-related references

........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@130045 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 7 deletions

diff --git a/CHANGES b/CHANGES
index 8fbfaa68c..4c2329f5b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -201,28 +201,28 @@ Local channel changes
      feature is enabled by using the 'j' option in the Dial string to the Local
      channel in conjunction with the existing 'n' option for local channels.
 
-Zaptel channel driver (chan_zap) Changes
+DAHDI channel driver (chan_dahdi) Changes
 ----------------------------------------
-  * SS7 support in chan_zap (via libss7 library)
+  * SS7 support (via libss7 library)
   * In India, some carriers transmit CID via dtmf. Some code has been added
      that will handle some situations. The cidstart=polarity_IN choice has been added for
      those carriers that transmit CID via dtmf after a polarity change.
   * CID matching information is now shown when doing 'dialplan show'.
-  * Added zap show version CLI command to chan_zap.
-  * Added setvar support to zapata.conf channel entries.
+  * Added dahdi show version CLI command.
+  * Added setvar support to chan_dahdi.conf channel entries.
   * Added two new options: mwimonitor and mwimonitornotify.  These options allow
      you to enable MWI monitoring on FXO lines.  When the MWI state changes,
      the script specified in the mwimonitornotify option is executed.  An internal
      event indicating the new state of the mailbox is also generated, so that
      the normal MWI facilities in Asterisk work as usual.
   * Added signalling type 'auto', which attempts to use the same signalling type
-     for a channel as configured in Zaptel. This is primarily designed for analog
+     for a channel as configured in DAHDI. This is primarily designed for analog
      ports, but will also work for digital ports that are configured for FXS or FXO
-     signalling types. This mode is also the default now, so if your zapata.conf
+     signalling types. This mode is also the default now, so if your chan_dahdi.conf
      does not specify signalling for a channel (which is unlikely as the sample
      configuration file has always recommended specifying it for every channel) then
      the 'auto' mode will be used for that channel if possible.
-  * Added a 'zap set dnd' command to allow CLI control of the Do-Not-Disturb
+  * Added a 'dahdi set dnd' command to allow CLI control of the Do-Not-Disturb
      state for a channel; also ensured that the DNDState Manager event is
      emitted no matter how the DND state is set or cleared.