4 files changed, 120 insertions, 120 deletions

diff --git a/doc/book-enea-edge-release-info/doc/about_release.xml b/doc/book-enea-edge-release-info/doc/about_release.xml
index 1f98ce6..076538f 100644
--- a/doc/book-enea-edge-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -6,19 +6,19 @@
 
   <para>Enea Edge is a complete Virtualization Infrastructure software
   platform designed for deployment on any white box uCPE device, and optimized
-  for common use-cases. It includes the Enea Edge Runtime deployed
-  on a white box, the Enea Edge Management application and the Enea Edge 
-    Automation, management and automation tools deployed in a 
-    private or public cloud.</para>
+  for common use-cases. It includes the Enea Edge Runtime deployed on a white
+  box, the Enea Edge Management application and the Enea Edge Automation,
+  management and automation tools deployed in a private or public
+  cloud.</para>
 
-  <para>The Enea Edge <xi:include
-  href="../../eltf_params_updated.xml"
+  <para>The Enea Edge <xi:include href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaEdge_REL_VER/1)" /> Release includes new features, 
-    optimizations, corrections, and updates to the user documentation.. 
-    A list of major new features and improvements can be found in  
-    <xref linkend="relinfo-changes-other">Section 2.1 New Features and Improvements</xref>.</para>
-  
+  xpointer="element(EneaEdge_REL_VER/1)" /> Release includes new features,
+  optimizations, corrections, and updates to the user documentation. A list of
+  major new features and improvements can be found in <xref
+  linkend="relinfo-changes-other">Section 2.1 New Features and
+  Improvements</xref>.</para>
+
   <section id="release-content">
     <title>Enea Edge Release Content</title>
 
@@ -149,8 +149,7 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" />.
         Describes the Automation Framework and Test Harness for Enea Edge
-        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
-        Features and Improvements</xref>).</para>
+        (deprecated).</para>
       </listitem>
 
       <listitem>
@@ -158,8 +157,7 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_edge_system_test_specification/1)" />.
         Describes a sample Test Suite for System Testing of Enea Edge.
-        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
-        Features and Improvements</xref>).</para>
+        (deprecated).</para>
       </listitem>
     </itemizedlist>
   </section>
diff --git a/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
index 53d3849..13a8c23 100644
--- a/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
@@ -4,10 +4,9 @@
 <chapter id="bugs-limitations">
   <title>Known Issues and Limitations in this Release</title>
 
-  <para><emphasis role="bold">Issues and limitations found in the Enea Edge
-  <xi:include href="../../eltf_params_updated.xml"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaEdge_REL_VER/1)" /> release:</emphasis></para>
+  <note>
+    <para>All issues may also affect previous releases.</para>
+  </note>
 
   <itemizedlist>
     <listitem>
@@ -18,34 +17,44 @@
     </listitem>
 
     <listitem>
-      <para><remark>ELCCR-1733</remark>Logging into the Enea Edge Management 
-        application over HTTP can fail, producing the error 
-        <literal>You have been automatically logged out</literal>. If this 
-        happens, the user should clear the <literal>JSESSIONID</literal> 
-        browser's cookie or close and restart the browser.</para>      
+      <para><remark>ELCCR-1733</remark>Logging into the Enea Edge Management
+      application over HTTP can fail, producing the error <literal>You have
+      been automatically logged out</literal>. If this happens, the user
+      should clear the <literal>JSESSIONID</literal> browser's cookie or close
+      and restart the browser.</para>
     </listitem>
 
     <listitem>
-      <para><remark>ELCCR-1753</remark>For tap interfaces, port numbers
-      assigned to VM bridge interfaces can change when the VMs are
-      restarted.</para>
+      <para><remark>ELCCR-1753</remark>When using tap interfaces for
+      communicating over the bridge, port numbers assigned to VM interfaces
+      can change when the VMs are restarted. The only currently known
+      workaround is rebooting the uCPE device.</para>
+    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1999</remark>Attempting to upload multiple files 
+        simultaneously (e.g. a VNF image and custom scripts) in the Enea Edge
+        Management application will cause all upload operations to be canceled. 
+        In order to avoid this limitation, please wait until any previous 
+        upload finishes before initiating a new one.</para>
     </listitem>
 
     <listitem>
-      <para><remark>LXCR-10922</remark>There is a very rare sporadic error on
-      the X553 SFP+ ethernet ports on Atom C3000 boards. This has been
-      verified on Supermicro A2SDi-TP8F boards. This sporadic error makes X553
-      ethernet ports unusable until a target cold reset is performed. When the
-      error occurs in Enea Edge Runtime 2.5.0, there will be a warning printed
-      into console by the ixgbe driver as follows: 
-        <programlisting>[ 11.361580] ixgbe 0000:0a:00.0: Warning firmware error detected FWSM: 0x8010801A</programlisting> 
-        The only currently known workaround for this issue is a cold reset.</para>
+      <para><remark>LXCR-10922</remark>A very rare error on some Atom C3000
+      boards makes X553 SFP+ Ethernet ports unusable until a target cold reset
+      is performed. When the error occurs in Enea Edge Runtime 2.5.0, there
+      will be a warning printed into the console by the
+      <literal>ixgbe</literal> driver:</para>
+
+      <programlisting>[11.361580] ixgbe 0000:0a:00.0: Warning firmware error detected FWSM: 0x8010801A</programlisting>
+
+      <para>The only currently known workaround for this issue is a cold
+      reset.</para>
     </listitem>
   </itemizedlist>
 
-  <para><emphasis role="bold">Issues and limitations found in previous
-  releases of Enea Edge that still affect this current
-  release:</emphasis></para>
+  <para><emphasis role="bold">Limitations detected in previous releases, 
+    that still affect this release:</emphasis></para>
 
   <itemizedlist>
     <listitem>
@@ -78,7 +87,7 @@
       the VNF's domain XML. This impacts all example use cases where the
       Juniper VNF is used.</para>
     </listitem>
-    
+
     <listitem>
       <para><remark>ELCCR-912</remark>When the Enea Edge Management
       application is installed on CentOS 7, prior to C7.1804 (kernel version
@@ -105,7 +114,7 @@
       uninstallation, the Tomcat instance and Watchdog service will not be
       stopped automatically. Instead, they must be killed explicitly.</para>
     </listitem>
-    
+
     <listitem>
       <para><remark>ELCCR-1565</remark>Before starting an Enea Edge Management
       upgrade, any owned Tomcat certificates should be manually copied into
@@ -157,36 +166,6 @@
     </listitem>
 
     <listitem>
-      <para><remark>STCR-6224</remark>The Enea Edge Automation Framework and
-      Test Harness do not support multiple custom scripts uploaded to a uCPE
-      device at the same time.</para>
-      
-      <note>
-        <para>This limitation does not apply to Enea Edge Automation. It only 
-          affects the Enea Edge Automation Framework and Test Harness.</para>
-      </note>
-    </listitem>    
-
-    <listitem>
-      <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
-      implemented in the Enea Edge Automation Framework and Test
-      Harness.</para>
-    </listitem>
-
-    <listitem>
-      <para><remark>USERDOCAP-628</remark>The Enea Edge Automation Framework
-      and Test Harness do not have support for product features implemented in
-      Enea Edge 2.4.0 or newer.</para>
-
-      <note>
-        <para>This limitation does not apply to Enea Edge Automation. It only 
-          affects the Enea Edge Automation Framework and Test Harness. Please 
-          use the new Enea Edge Automation component if you want support for 
-          newer features.</para>
-      </note>
-    </listitem>
-
-    <listitem>
       <para><remark>USERDOCAP-641</remark>Enea Edge does not have support for
       IPv6 addresses on both uCPE devices and the Enea Edge Management
       installation.</para>
@@ -207,6 +186,31 @@
     </listitem>
   </itemizedlist>
 
+  <para><emphasis role="bold">The following limitations affect deprecated
+  components and their documentation:</emphasis></para>
+
+  <itemizedlist>
+    <listitem>
+      <para><remark>STCR-6224</remark>The Enea Edge Automation Framework and
+      Test Harness do not support multiple custom scripts uploaded to a uCPE
+      device at the same time. This limitation does not apply to Enea Edge
+      Automation.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
+      implemented in the Enea Edge Automation Framework and Test
+      Harness. This limitation does not apply to the Enea Edge Automation.</para>
+    </listitem>
+
+    <listitem>
+      <para><remark>USERDOCAP-628</remark>The Enea Edge Automation Framework
+      and Test Harness do not have support for product features implemented in
+      Enea Edge 2.4.0 or newer. Please use the new Enea Edge Automation 
+        component if you want support for newer features.</para>
+    </listitem>
+  </itemizedlist>
+
   <!-- The file with a section below is autocreated by make init  -->
 
   <!-- <xi:include href="jiraissues_generated.xml"
diff --git a/doc/book-enea-edge-release-info/doc/main_changes.xml b/doc/book-enea-edge-release-info/doc/main_changes.xml
index 85a5e7e..629a892 100644
--- a/doc/book-enea-edge-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -58,23 +58,23 @@
         xpointer="element(book_enea_edge_getting_started/1)" /></olink>
         Manual.</para>
       </listitem>
+    </itemizedlist>
+
+    <para><emphasis role="bold">Improvements:</emphasis></para>
 
+    <itemizedlist>
       <listitem>
-        <para>Support for a Factory Reset to allow reverting of the Enea Edge
-        Runtime to its initial state. For more details please see <olink
+        <para>Documented and hardened support for Factory Reset allowing 
+          reverting of the Enea Edge Runtime to its initial state. 
+          For more details please see <olink
         targetdoc="book_enea_edge_getting_started"
         targetptr="basic_oper_device">Basic operations for uCPE device
-        Management in the <xi:include
+        Management in the <ns:include
         href="../../s_docbuild/olinkdb/pardoc-names.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_getting_started/1)" /></olink>
-        Manual.</para>
+        xpointer="element(book_enea_edge_getting_started/1)"
+        xmlns:ns="http://www.w3.org/2001/XInclude" /></olink> Manual.</para>
       </listitem>
-    </itemizedlist>
 
-    <para><emphasis role="bold">Improvements:</emphasis></para>
-
-    <itemizedlist>
       <listitem>
         <para>Added support for uploading multiple custom scripts on a uCPE
         Device in the Enea Edge Automation framework.</para>
@@ -96,51 +96,49 @@
       </listitem>
 
       <listitem>
-        <para>The Enea Edge Management application will wait for 10 minutes
-        instead of 5 for the Enea Edge Runtime upgrade operations to complete
-        successfully, before reporting an error.</para>
-      </listitem>
-
-      <listitem>
         <para>Improved the upgrade and uninstall processes of the Enea Edge
         Management component: the database information is no longer requested
         during an upgrade or an uninstall.</para>
       </listitem>
 
       <listitem>
-        <para>Enea Edge Runtime key component upgrades include:</para> 
-          
-          <itemizedlist spacing="compact">
-            <listitem>
-              <para>Linux kernel 5.10</para>
-            </listitem>
+        <para>Enea Edge Runtime key component upgrades include:</para>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>Linux kernel 5.10</para>
+          </listitem>
+
+          <listitem>
+            <para>Open vSwitch 2.15</para>
+          </listitem>
+
+          <listitem>
+            <para>QEMU 5.2.0</para>
+          </listitem>
 
-            <listitem>
-              <para>Open vSwitch 2.15</para>
-            </listitem>
+          <listitem>
+            <para>libvirt 6.3.0</para>
+          </listitem>
 
-            <listitem>
-              <para>QEMU 5.2.0</para>
-            </listitem>
+          <listitem>
+            <para>DPDK 20.11.1</para>
+          </listitem>
 
-            <listitem>
-              <para>libvirt 6.3.0</para>
-            </listitem>
+          <listitem>
+            <para>Python 3.9.4</para>
+          </listitem>
+        </itemizedlist>
 
-            <listitem>
-              <para>DPDK 20.11.1</para>
-            </listitem>
-          
-            <listitem>
-              <para>Python 3.9.4, replacing Python2 support</para>
-            </listitem>          
-          </itemizedlist>
-        
-            <para>Further information about what open source versions are used 
-              in Enea Edge Runtime, can be found in the Enea Edge Runtime 
-              Open Source Report.</para>
+        <para>Further information about what open source versions are used in
+        Enea Edge Runtime, can be found in the Enea Edge Runtime Open Source
+        Report.</para>
       </listitem>
     </itemizedlist>
+    
+    <para></para>
+    <para></para>
+    <para></para>
 
     <para><emphasis role="bold">Early Access Features:</emphasis></para>
 
@@ -151,7 +149,8 @@
       <listitem>
         <para><remark>CPDX-3498</remark>High Availability support with
         redundant Enea Edge Management applications in active standby
-        configuration.</para>
+        configuration. This EA feature has remained unchanged since the 
+          Enea Edge 2.4.0 release.</para>
 
         <para>In order to increase resiliency on the uCPE management side, the
         Enea Edge Management application can be installed in High-Availability
@@ -214,6 +213,9 @@
     <title>Compatibility</title>
 
     <para>This release does not contain any public API changes impacting
-    backwards compatibility.</para>
+    backwards compatibility. However, Python 2 support in Enea Edge Runtime 
+      has been discontinued starting with the current version of Enea Edge. 
+      This could affect existing custom scripts using Python 2 syntax. Please 
+      update these scripts accordingly in order to run in a Python 3 environment.</para>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/eltf_params_updated.xml b/doc/eltf_params_updated.xml
index f5f3f7d..39755ef 100644
--- a/doc/eltf_params_updated.xml
+++ b/doc/eltf_params_updated.xml
@@ -10,7 +10,7 @@
     <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
     correct also compared to the "previous" REL VER in pardoc-distro.xml
     "prev_baseline".</bridgehead>
-    
+
     <para id="EneaEdge_REL_VER"><phrase>2.5.0</phrase></para>
 
     <para id="ENA_BUILD_VER"><phrase>1</phrase></para>
@@ -159,10 +159,6 @@
                   <entry>Supermicro SuperServer 5019A-12TN4 (Intel Atom
                   C3850)</entry>
                 </row>
-
-                <row>
-                  <entry>Silicom C3000 (Intel Atom 3558)</entry>
-                </row>
               </tbody>
             </entrytbl>
           </row>