Prepare release 2.6
Change-Id: I2e73f2ec31f07076f0abba557d23c5ec79bc8915
diff --git a/docs/source/RELEASE_NOTES.rst b/docs/source/RELEASE_NOTES.rst
index 8493cc3..5220d11 100644
--- a/docs/source/RELEASE_NOTES.rst
+++ b/docs/source/RELEASE_NOTES.rst
@@ -5,6 +5,43 @@
All of the ndnSIM documentation is accessible from the `ndnSIM website <http://ndnsim.net>`__.
+Release 2.6
+-----------
+
+Release date: August 7, 2018
+
+Overview
+~~~~~~~~
+
+- The submodules of NFD and ndn-cxx have been upgraded to version 0.6.2
+ (:issue:`4514`).
+
+ `NFD 0.6.2 release notes <https://named-data.net/doc/NFD/0.6.2/RELEASE_NOTES.html>`__
+
+ `ndn-cxx 0.6.2 release notes <https://named-data.net/doc/ndn-cxx/0.6.2/RELEASE_NOTES.html>`__
+
+ .. note::
+ In order to retrieve the marked versions of ndn-cxx and NFD, use
+ ``--recursive`` option to the git clone command or run ``git
+ submodule update --init`` after clone, pull, or merge.
+
+- This will be the last release that supports "old" API for content store implementations.
+ Going forward, only NFD-based implementations will be supported.
+
+Improvements and bug fixes
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+- Add queue length congestion detection and signaling (:issue:`4578`)
+
+- Implement BIC and CUBIC congestion control in ConsumerPcon (:issue:`4672`)
+
+- Fix compilation failure on some systems with Python 3
+
+- Fix outdated and remove deprecated APIs in the examples
+
+- Updates of the ndnSIM documentation.
+
+
Release 2.5
-----------
diff --git a/docs/source/_templates/indexcontent.html b/docs/source/_templates/indexcontent.html
index ac24170..4120c16 100644
--- a/docs/source/_templates/indexcontent.html
+++ b/docs/source/_templates/indexcontent.html
@@ -59,8 +59,9 @@
<td width="50%" valign="top">
<h2>ndnSIM Versions</h2>
<div class="tile">
- <p class="biglink"><a class="biglink" href="#">ndnSIM 2.5</a><br/>
+ <p class="biglink"><a class="biglink" href="#">ndnSIM 2.6</a><br/>
<span class="linkdescr">latest version</span></p>
+ <p class="biglink"><a class="biglink" href="http://ndnsim.net/2.5/">ndnSIM 2.5</a><br/>
<p class="biglink"><a class="biglink" href="http://ndnsim.net/2.4/">ndnSIM 2.4</a><br/>
<p class="biglink"><a class="biglink" href="http://ndnsim.net/2.3/">ndnSIM 2.3</a><br/>
<p class="biglink"><a class="biglink" href="http://ndnsim.net/2.2/">ndnSIM 2.2</a><br/>