Merged revisions 203960 via svnmerge from

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

........
  r203960 | russell | 2009-06-27 04:51:45 -0500 (Sat, 27 Jun 2009) | 2 lines
  
  Minor tweaks and spelling fixes for CHANGES and UPGRADE.txt.
........


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

1 files changed, 4 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index f5206442c..98bb2eb9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -308,12 +308,8 @@ SIP Changes
    as well as periodically updating the IP address. These properties allow for
    better performance as well as recovery in the event of an IP change.
  * Performance improvements via using hash tables (astobj2) and doubly-linked lists to improve 
-   load/reload of large numbers of peers/users by ~40x (for large lists of peers.
-   Initially, we saw 4x improvement in call setup/destruction, but at the time
-   of merging, this gain has disappeared; further research will be done to try
-   and restore this performance improvement. Astobj2 refcounting is now used
-   for users, peers, and dialogs.  Users are encouraged to assist in regression
-   testing and problem reporting!
+   load/reload of large numbers of peers/users by ~40x (for large lists of peers).
+   These changes also provide performance improvements for call setup and tear down.
  * Added ability to specify registration expiry time on a per registration basis in
    the register line.
  * Added support for T140 RED - redundancy in T.140 to prevent text loss due to
@@ -949,11 +945,11 @@ Logger changes
 --------------
   * Added rotatestrategy option to logger.conf, along with two new options:
      "timestamp" which will use the time to name the logger files instead of
-     sequence number; and "rotate", which rotates the names of the logfiles,
+     sequence number; and "rotate", which rotates the names of the log files,
      similar to the way syslog rotates files.
   * Added exec_after_rotate option to logger.conf, which allows a system
      command to be run after rotation.  This is primarily useful with
-     rotatestrategry=rotate, to allow a limit on the number of logfiles kept
+     rotatestrategry=rotate, to allow a limit on the number of log files kept
      and to ensure that the oldest log file gets deleted.
   * Added realtime support for the queue log