From cc8ccb3cc3a51879bedd57fb83e89ab1200451a2 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Mon, 18 Nov 2013 08:35:19 -0800
Subject: [PATCH] update RELEASE_NOTES and CHANGES.html for ns-3.18.1 release

---
 CHANGES.html  | 29 ++++++++++++++++++++++++-----
 RELEASE_NOTES | 31 ++++++++++++++-----------------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 3f0a12db5..a8eff49e5 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -51,22 +51,41 @@ 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.18 to ns-3.19</h1>
+<h1>Changes from ns-3.18 to ns-3.18.1</h1>
 <h2>New API:</h2>
 <ul>
-  <li></li>
+  <li> It is now possible to randomize the time of the first beacon from an
+  access point.  Use an attribute "EnableBeaconJitter" to enable/disable
+  this feature.
+  </li>
+  <li> A new FixedRoomPositionAllocator helper class is available; it
+  allows one to generate a random position uniformly distributed in the
+  volume of a chosen room inside a chosen building.
+  </li>
 </ul>
+
 <h2>Changes to existing API:</h2>
 <ul>
-  <li></li>
+  <li> Logging wildcards:  allow "***" as synonym for "*=**" to turn on all logging.
+  </li>
+  <li> The log component list ("NS_LOG=print-list") is now printed alphabetically.
+  </li>
+  <li> Some deprecated IEEE 802.11p code has been removed from the wifi module
+  </li>
 </ul>
+
 <h2>Changes to build system:</h2>
 <ul>
-  <li></li>
+  <li> The Python API scanning system (./waf --apiscan) has been fixed (bug 1622)
+  </li> 
+  <li> Waf has been upgraded from 1.7.11 to 1.7.13
+  </li> 
 </ul>
+
 <h2>Changed behavior:</h2>
 <ul>
-  <li></li>
+  <li> Wifi simulations have additional jitter on AP beaconing (see above) and some bug fixes have been applied to wifi module (see RELEASE_NOTES)
+  </li> 
 </ul>
 
 <hr>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 97626df98..757bbc432 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -9,31 +9,28 @@ http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
-Release 3-dev
-=============
-
-Availability
-------------
-This release is not yet available.
-
-Supported platforms
--------------------
-
-New user-visible features
--------------------------
-
-Bugs fixed
-----------
-
 Release 3.18.1
 ==============
 
+This release is mainly to provide updated compiler support (clang/LLVM)
+and fix the Python API scanning facility.  A few additional bug fixes
+and new features are described below.
+
 Availability
 ------------
-This release is not yet available.
+This release is available from:
+http://www.nsnam.org/release/ns-allinone-3.18.1.tar.bz2
 
 Supported platforms
 -------------------
+These platforms have been tested; others may work also:
+- Fedora Core 19 (32/64 bit) with g++-4.8.1
+- Ubuntu 13.10 (64 bit) with g++-4.8.1
+- Ubuntu 12.04.3 (32/64 bit) with g++-4.6.3
+- Ubuntu 10.04.4 LTS (64 bit) with g++-4.4.3
+- OS X Mavericks 10.9 with Xcode 5.0.1 and clang-500.2.79
+- OS X Mountain Lion 10.8.5 with Xcode 5 and g++-4.2.1
+- FreeBSD 9.2-RELEASE (64 bit) with clang-3.3
 
 New user-visible features
 -------------------------