From d3b571e7dcd4cac00f3d84ac9babd78e233ab393 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Sun, 19 Jul 2020 17:26:18 -0700
Subject: [PATCH] Update RELEASE_NOTES and CHANGES.html

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

diff --git a/CHANGES.html b/CHANGES.html
index 84c59efa5..eda69e3dd 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -58,7 +58,8 @@ us a note on ns-developers mailing list.</p>
 </ul>
 <h2>Changes to existing API:</h2>
 <ul>
-<li></li>
+<li>Added "--enable-asserts" and "--enable-logs" to waf configure, to selectively enable asserts and/or logs in release and optimized builds.</li>
+<li>The <b>Sifs</b>, <b>Slot</b> and <b>Pifs</b> attributes have been moved from <b>WifiMac</b> to <b>WifiPhy</b> to better reflect that they are PHY characteristics, to decouple the MAC configuration from the PHY configuration and to ease the support for future standards.</li>
 </ul>
 <h2>Changes to build system:</h2>
 <ul>
@@ -66,7 +67,6 @@ us a note on ns-developers mailing list.</p>
 </ul>
 <h2>Changed behavior:</h2>
 <ul>
-<li>The <b>Sifs</b>, <b>Slot</b> and <b>Pifs</b> attributes have been moved from <b>WifiMac</b> to <b>WifiPhy</b> to better reflect that they are PHY characteristics, to decouple the MAC configuration from the PHY configuration and to ease the support for future standards.</li>
 <li>Support for <b>RIFS</b> has been dropped from wifi. RIFS has been obsoleted by the 802.11 standard and support for it was not implemented according to the standard.</li>
 </ul>
 
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 7ed3fc629..496dbe509 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -15,11 +15,11 @@ Release 3-dev
 New user-visible features
 -------------------------
 - (build system) Added "--enable-asserts" and "--enable-logs" to waf configure,
-   to selectively enable asserts and/or logs in release and optimized builds,
-   at user's wish.
+   to selectively enable asserts and/or logs in release and optimized builds.
 
 Bugs fixed
 ----------
+- (traffic-control) #225 - Do not mark packet twice within a CoDel queue
 
 Release 3.31
 ============