From f833fe75679065765bc7846416d096f3cc7d7d91 Mon Sep 17 00:00:00 2001
From: Biljana Bojovic <biljana.bojovic@gmail.com>
Date: Fri, 3 Feb 2017 19:02:13 +0100
Subject: [PATCH] lte: update release notes, changes, and lte 3GPP release
 version.

---
 CHANGES.html               | 14 ++++++++++++++
 RELEASE_NOTES              |  1 +
 src/lte/doc/source/conf.py |  4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index a36686b30..00ac980c0 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -65,6 +65,20 @@ us a note on ns-developers mailing list.</p>
       <li>A new information element has been added:  HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilites information element is used to advertise the HE capabilites of the node to other nodes in the network.</li>
     </ul>
 </li>
+<li>Included carrier aggregation feature in LTE module</li>
+    <ul>
+      <li>LTE model is extended to support carrier aggregation feature according to 3GPP Release 10, for up to 5 component 
+      carriers. </li>
+      <li>InstallSingleEnbDevice and InstalSingeUeDevice functions of LteHelper are now constructing LteEnbDevice and LteUeDevice 
+      according to CA architecture. Each device, UE and eNodeB contains an instance of component carrier manager, and may 
+      have several component carrier instances.</li>
+      <li>SAP interfaces are extended to include CA message exchange funtionality.</li>
+      <li>RRC connection procedure is extended to allow RRC connection reconfiguration for the configuration of the secondary carriers.</li>
+      <li>RRC measurement reporting is extended to allow measurement reporting from the secondary carriers.</li>
+      <li>LTE traces are extended to include component carrier id.</li>      
+      <li>A</li>
+    </ul>
+</li>
 <li>Function <b>PrintRoutingTable</b> has been extended to add an optional Time::Units
     parameter to specify the time units used on the report.  The new parameter is
     optional and if not specified defaults to the previous behavior (Time::S).
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 96d06a8b2..b1ab0c392 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -23,6 +23,7 @@ New user-visible features
 -------------------------
 - (wifi) 802.11ax High Efficiency (HE) physical layer modes are now supported.
 - (tcp) The SACK option and the RFC 6675 loss recovery algorithm are now supported.
+- (lte) LTE carrier aggregation feature according to 3GPP Release 10 is now supported.
 
 Bugs fixed
 ----------
diff --git a/src/lte/doc/source/conf.py b/src/lte/doc/source/conf.py
index 227126cea..35642ff52 100644
--- a/src/lte/doc/source/conf.py
+++ b/src/lte/doc/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'CTTC'
 # built documents.
 #
 # The short X.Y version.
-version = 'v8'
+version = 'v10'
 # The full version, including alpha/beta/rc tags.
-release = 'v8'
+release = 'v10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.