Moved those comments from UPGRADE.txt to CHANGES. Ooops.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@70141 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/CHANGES b/CHANGES
index d3b13b8f00b3054aa0779bbfb41e72fedcefc26f..62c223d3baf2a10711843d830ba03b09b93735a7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -180,6 +180,9 @@ Miscellaneous
   * Added 'C' option to Meetme which causes a caller to continue in the dialplan
      when kicked out.
   * Brazilian Portuguese (pt-BR) in VM, and say.c was added via patch from cfassoni.
+  * 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 maxfiles option to options section of asterisk.conf which allows you to specify
      what Asterisk should set as the maximum number of open files when it loads.
@@ -194,6 +197,8 @@ Miscellaneous
   * SMDI is now enabled in voicemail using the smdienable option.
   * Added zap show version CLI command to chan_zap.
   * Added a new CDR module, cdr_sqlite3_custom.
+  * The cdr_manager module has a [mappings] feature, like cdr_custom,
+    to add fields to the manager event from the CDR variables.
   * Added a new realtime configuration module, res_config_sqlite
   * Added a new dialplan application, Bridge, which allows you to bridge the
      calling channel to any other active channel on the system.

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 64245a96aba65523182e8195b54660749ae40c34..b4f800b390915ca904f2b7f04bfec03ad78b43d3 100644 (file)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -57,9 +57,6 @@ CDR:
   cdr_sqlite3_custom.  It will potentially be removed from the tree
   after Asterisk 1.6 is released.
 
-* The cdr_manager module has a [mappings] feature, like cdr_custom,
-  to add fields to the manager event from the CDR variables.
-
 Formats:
 
 * format_wav: The GAIN preprocessor definition and source code that used it
@@ -78,7 +75,3 @@ Channel Drivers:
   user has not configured the automon feature, the normal "415 Unsupported media type"
   is returned, and nothing is done.
 
-* chan_zap.c: 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.
-