From ea8ccecfdeaf63a15d74ca87793b338e5e03eae5 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 5 Feb 2015 16:39:39 -0800
Subject: [PATCH] update RELEASE_NOTES and CHANGES.html for post-ns-3.22

---
 CHANGES.html  | 16 ++++++++++++++++
 RELEASE_NOTES | 35 +++++++++++++++++++++++++++++++----
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index bbb02bbd2..7da00da55 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -50,6 +50,22 @@ the cracks, unfortunately.  If you, as a user, can suggest improvements
 to this file based on your experience, please contribute a patch or drop
 us a note on ns-developers mailing list.</p>
 
+<hr>
+<h1>Changes from ns-3.22 to ns-3.23</h1>
+<h2>New API:</h2>
+<ul>
+</ul>
+<h2>Changes to existing API:</h2>
+<ul>
+</ul>
+<h2>Changes to build system:</h2>
+<ul>
+</ul>
+<h2>Changed behavior:</h2>
+This section is for behavioral changes to the models that were not due to a bug fix.
+<ul>
+</ul>
+
 <hr>
 <h1>Changes from ns-3.21 to ns-3.22</h1>
 <h2>New API:</h2>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 0a3415b3e..c1368d407 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -10,7 +10,7 @@ Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
 Release 3-dev
-=============
+============
 
 Availability
 ------------
@@ -19,6 +19,34 @@ This release is not yet available.
 Supported platforms
 -------------------
 
+New user-visible features
+-------------------------
+
+Bugs fixed
+----------
+
+Known issues
+------------
+
+Release 3.22
+============
+
+Availability
+------------
+This release is available from:
+http://www.nsnam.org/release/ns-allinone-3.22.tar.bz2
+
+Supported platforms
+-------------------
+This release has been tested on the following platforms:
+- Fedora Core 21 (64 bit) with g++-4.9.2
+- Ubuntu 14.10 (32 bit) with g++-4.9.1
+- Ubuntu 14.04 (64 bit) with g++-4.8.2
+- Ubuntu 12.04.4 (32/64 bit) with g++-4.6.3
+- CentOS/RHEL 6.6 (64-bit) with g++-4.4.7
+- OS X Yosemite 10.10 with Xcode 6.1.1 and clang-600.0.56
+- FreeBSD 10.1-RELEASE (64 bit) with clang-3.4.1
+
 New user-visible features
 -------------------------
 - (wifi) Support for MPDU aggregation has been added to the wifi model, 
@@ -28,7 +56,6 @@ New user-visible features
   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
   complete release bearer procedure is now implemented, which can be
@@ -51,9 +78,9 @@ New user-visible features
   framework to traced values emitting Time objects
 - (documentation) the callback function signatures for all TraceSources
   is documented in Doxygen
-- print-introspected-doxygen.sh has had several enhancements;
+- (utils) print-introspected-doxygen.cc has had several enhancements;
   use -h to read the usage message for details.
-- TracedValue and TracedCallback function signatures are now documented,
+- (core) TracedValue and TracedCallback function signatures are now documented,
   which required changing the TypeId::AddTraceSource API.
 
 Bugs fixed