From 41e93b8ce4f7e8cc4f8b4c36f5df0cc1df0464f4 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Mon, 3 Jan 2011 13:13:26 -0800
Subject: [PATCH] update release notes and CHANGES.html file

---
 CHANGES.html  | 6 +++++-
 RELEASE_NOTES | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.html b/CHANGES.html
index 89494a599..88ce89915 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -53,8 +53,12 @@ us a note on ns-developers mailing list.  </p>
 separate reference trace repository is no longer needed to perform 
 regression tests.  Tests that require comparison against known good traces
 can still be run from test.py.  The --regression option for waf has been
-removed.
+removed.  However, the "-r" option to download.py has been kept to 
+allow users to fetch older revisions of ns-3 that contain these traces.
 </p>
+<li><b>Documentation converted to Sphinx</b>
+<p> Project documentation (manual, tutorial, and testing) have been
+converted to Sphinx from the GNU Texinfo markup format.</p>
 </ul>
 
 <h2>New API:</h2>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index ac9e1917e..00b93c4b5 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -127,6 +127,8 @@ New user-visible features
      (viii) a channel model with the outdoor E-UTRAN propagation loss 
      model.
 
+   - Project documentation has been converted from GNU Texinfo to Sphinx. 
+
 Bugs fixed
 ----------
 The following lists many of the bugs fixed or small feature additions