From 0be6196946b65c123db45da969e49d9d47152ef2 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Tue, 3 Feb 2015 16:27:01 -0800
Subject: [PATCH] update RELEASE_NOTES and CHANGES.html

---
 CHANGES.html  | 10 ++++++----
 RELEASE_NOTES | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 1f38a7259..bbb02bbd2 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -54,11 +54,11 @@ us a note on ns-developers mailing list.</p>
 <h1>Changes from ns-3.21 to ns-3.22</h1>
 <h2>New API:</h2>
 <ul>
-  <li> New classes were added for the PARF and APARF WiFi rate controls. 
+  <li> New classes were added for the PARF and APARF WiFi power and rate control mechanisms. 
   </li>
   <li> Support for WiFi 802.11n MPDU aggregation has been added.
   </li>
-  <li> Support for modeling of vehicular WiFi networks (IEEE 1609.4) has been added.  In addition, a basic safety message (BSM) application traffic generator and related statistics-gathering classes have been added to the wave module. 
+  <li> Additional support for modeling of vehicular WiFi networks has been added, including the channel-access coordination feature of IEEE 1609.4.  In addition, a Basic Safety Message (BSM) packet generator and related statistics-gathering classes have been added to the wave module. 
   </li>
   <li> A complete LTE release bearer procedure is now implemented which can be invoked by calling the new helper method LteHelper::DeActivateDedicatedEpsBearer ().
   </li>
@@ -91,8 +91,8 @@ to control modeling of RTO calculation.
        for all TracedSources, using an extra (fourth) argument to
        TypeId::AddTraceSource to pass the fully-qualified name
        of the signature typedef.  To ensure that future TraceSources
-       are similarly documented we have deprecated the three
-       argument version of AddTraceSource.
+       are similarly documented, the three argument version of 
+       AddTraceSource has been deprecated.
   </li>	
   <li> The "MinRTO" attribute of the RttEstimator class was moved to the TcpSocketBase class.  The "Gain" attribute of the RttMeanDeviation class was replaced 
 by new "Alpha" and "Beta" attributes.  
@@ -168,6 +168,8 @@ This section is for behavioral changes to the models that were not due to a bug
   </li>
   <li> A new CoDel queue model has been added to the 'internet' module.  
   </li>
+  <li> New test macros NS_TEST_ASSERT_MSG_GT_OR_EQ() and NS_TEST_EXPECT_MSG_GT_OR_EQ() have been added.
+  </li>
 </ul>
 
 <h2>Changes to existing API:</h2>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index f7acf20a4..0a3415b3e 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -23,6 +23,11 @@ New user-visible features
 -------------------------
 - (wifi) Support for MPDU aggregation has been added to the wifi model, 
   as well as a number of related example programs.
+- (wifi) Added two combined power and rate control mechanisms to the
+  wifi module.  The new mechanisms, PARF and APARF, are the first in the
+  wifi module to jointly control transmission power and data rate.  Two use 
+  case examples (PowerAdaptationDistance and PowerAdaptationInterference) 
+  and a test case have also been added.
 - (wifi) PARF and APARF WiFi rate controls have been added to the wifi model.
 - (lte) In previous releases of the LTE module, the bearer release
   functionality was only partially supported. As an enhancement, a
@@ -32,10 +37,14 @@ New user-visible features
   seen through the stats collected at different layers like PDCP, RLC,
   MAC, PHY. To support this implementation, an example and test suite is
   added within the LTE module examples and tests folder.  
-- (wave) Support for WiFi-based vehicular communications using the 
-  IEEE 1609.4 framework has been added.  A Basic Safety Message (BSM) 
-  application packet generator, and associated statistics counters, has
-  been added.  A comprehensive VANET routing example has been added.
+- (wave) Additional support has been added for WiFi-based vehicular networks, 
+  including the channel-access coordination features of IEEE 1609.4 and a 
+  comprehensive VANET routing example that includes a Basic Safety 
+  Message (BSM) packet generator application and associated statistics 
+  counters.  Together, these allow users to evaluate the performance effects 
+  in a VANET of varying transmission and channel properties (e.g., packet 
+  rate, message size, transmit power, propagation loss model, impact of 
+  routing protocol traffic, etc.).
 - (internet) It is now possible to print the Neighbor Cache (ARP and NDISC) 
   by using the RoutingProtocolHelper
 - (stats) A new TimeProbe class has been added to hook the data collection