3 files changed, 58 insertions, 209 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 076538f..9d65de6 100644
--- a/doc/book-enea-edge-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -42,11 +42,6 @@
       <listitem>
         <para>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
-
-      <listitem>
-        <para>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip
-        (deprecated as of version 2.4.0.)</para>
-      </listitem>
     </itemizedlist>
 
     <para>Example Deployments:</para>
@@ -143,22 +138,6 @@
         Describes the Enea Edge Automation and provides instructions regarding
         the necessary steps to configure and run the tool.</para>
       </listitem>
-
-      <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        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).</para>
-      </listitem>
-
-      <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        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).</para>
-      </listitem>
     </itemizedlist>
   </section>
 </chapter>
\ No newline at end of file
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 13a8c23..ee56256 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
@@ -5,7 +5,7 @@
   <title>Known Issues and Limitations in this Release</title>
 
   <note>
-    <para>All issues may also affect previous releases.</para>
+    <para>No new limitations or issues were detected in this release.</para>
   </note>
 
   <itemizedlist>
@@ -17,33 +17,25 @@
     </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>
-    </listitem>
-
-    <listitem>
       <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>
+      <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>A very rare error on some Atom C3000
+      <para><remark>LXCR-10922</remark>A very rare error on certain 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
+      is performed. When the error occurs in Enea Edge Runtime 2.5.0 or later,
+      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>
@@ -51,12 +43,7 @@
       <para>The only currently known workaround for this issue is a cold
       reset.</para>
     </listitem>
-  </itemizedlist>
-
-  <para><emphasis role="bold">Limitations detected in previous releases, 
-    that still affect this release:</emphasis></para>
 
-  <itemizedlist>
     <listitem>
       <para><remark>ELCCR-474</remark>Deleting VNF instances with flows
       configured on the OVS bridges can be done only after removing the
@@ -160,12 +147,6 @@
     </listitem>
 
     <listitem>
-      <para><remark>LXCR-10750</remark>In order to avoid an incorrect boot
-      order after a failed upgrade, the user should remove the upgrade image
-      before attempting again.</para>
-    </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>
@@ -186,31 +167,6 @@
     </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 629a892..145972b 100644
--- a/doc/book-enea-edge-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -15,22 +15,11 @@
 
     <itemizedlist>
       <listitem>
-        <para>Support for Fully Qualified Domain Names (FQDN) for the Enea
-        Edge Management application address. For more details please see
-        <olink targetdoc="book_enea_edge_getting_started"
-        targetptr="prep_deploy">Preparing the Deployment in the <xi: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>
-      </listitem>
-
-      <listitem>
-        <para>Support for a DNS servers list for WAN interfaces with a static
-        IP configuration. For more details please see <olink
+        <para>Support for Multi-Factor Authentication in the Enea Edge
+        Management. For more details please see <olink
         targetdoc="book_enea_edge_getting_started"
-        targetptr="install_ena_device">Installing Enea Edge - uCPE Device
-        Installation in the <xi:include
+        targetptr="mfa_security">Authenticating using Multi-Factor
+        Authentication in the <xi: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>
@@ -38,109 +27,44 @@
       </listitem>
 
       <listitem>
-        <para>Support for NFV Infrastructure backup and restore to allow for
-        recovery to a previously known state. For more details please see
-        <olink targetdoc="book_enea_edge_getting_started"
-        targetptr="nfvi_backup">NFV Infrastructure Backup Operations in the
-        <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        <para>Support for White-labeling of the Enea Edge Management
+        application to replace Enea branding elements with custom logos. For
+        more details please see <olink
+        targetdoc="book_enea_edge_getting_started"
+        targetptr="whitelabel">White-labeling the Enea Edge Management Login in
+        the <xi: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>
       </listitem>
 
       <listitem>
-        <para>Support for VNF snapshotting to allow for storing, managing and
-        restoring snapshots of VNFs deployed on Enea Edge Runtime. For more
-        details please see <olink targetdoc="book_enea_edge_getting_started"
-        targetptr="vnf_snapshots">VNF Snapshots in the <xi:include
-        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        <para>Support for Automated Deployment Reporting to gather information
+        about all uCPE devices enrolled in a deployment. For more details
+        please see <olink targetdoc="book_enea_edge_automation_user_guide"
+        targetptr="auto_deploy_reporting">Automated Deployment Reporting in
+        the <xi: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_automation_user_guide/1)" /></olink>.</para>
       </listitem>
     </itemizedlist>
 
-    <para><emphasis role="bold">Improvements:</emphasis></para>
-
-    <itemizedlist>
-      <listitem>
-        <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 <ns:include
-        href="../../s_docbuild/olinkdb/pardoc-names.xml"
-        xpointer="element(book_enea_edge_getting_started/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" /></olink> Manual.</para>
-      </listitem>
-
-      <listitem>
-        <para>Added support for uploading multiple custom scripts on a uCPE
-        Device in the Enea Edge Automation framework.</para>
-      </listitem>
-
-      <listitem>
-        <para>Python APIs from the Enea Edge Automation framework can now be
-        run with a limited set of optional parameters.</para>
-      </listitem>
-
-      <listitem>
-        <para>Configuration files from the Enea Edge Automation framework can
-        now be generated in a non-interactive way with a limited set of
-        optional parameters.</para>
-      </listitem>
-
-      <listitem>
-        <para>Improved support for large deployments of Enea Edge.</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>
-
-          <listitem>
-            <para>Open vSwitch 2.15</para>
-          </listitem>
+    <para><emphasis role="bold">Removed Features:</emphasis></para>
 
-          <listitem>
-            <para>QEMU 5.2.0</para>
-          </listitem>
+    <para>The deprecated Enea Edge Automation Framework and Test Harness
+    component is no longer supported and has been removed. It is replaced by 
+      the new Automation Framework included with this release.</para>
 
-          <listitem>
-            <para>libvirt 6.3.0</para>
-          </listitem>
-
-          <listitem>
-            <para>DPDK 20.11.1</para>
-          </listitem>
-
-          <listitem>
-            <para>Python 3.9.4</para>
-          </listitem>
-        </itemizedlist>
+    <para><emphasis role="bold">Early Access Features:</emphasis></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>Early Access features are provided for evaluation and early
+    feedback. They are not allowed to be used for business-critical
+    deployment, unless previously approved by Enea. Support cases reported on
+    Early Access features may only be set to a Minor Priority, with the intent
+    of addressing them in upcoming GA releases.</para>
 
-    <para><emphasis role="bold">Early Access Features:</emphasis></para>
+    <para>Early Access Features are not described in the standard
+    documentation. Please contact Enea Support for documentation.</para>
 
     <para>The following Early Access features are included in this
     release:</para>
@@ -149,8 +73,8 @@
       <listitem>
         <para><remark>CPDX-3498</remark>High Availability support with
         redundant Enea Edge Management applications in active standby
-        configuration. This EA feature has remained unchanged since the 
-          Enea Edge 2.4.0 release.</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
@@ -159,13 +83,12 @@
         Centers and geographical locations, and with multiple MariaDB servers
         for each location.</para>
       </listitem>
-    </itemizedlist>
 
-    <para>Early Access features are provided for evaluation and early
-    feedback. They are not allowed to be used for business-critical
-    deployment, unless previously approved by Enea. Support cases reported on
-    Early Access features may only be set to a Minor Priority, with the intent
-    of addressing them in upcoming GA releases.</para>
+      <listitem>
+        <para>Support in the Enea Edge Management application to display uCPE
+        devices on a geographical map.<remark>CPDX-3512</remark></para>
+      </listitem>
+    </itemizedlist>
   </section>
 
   <section id="open_source">
@@ -178,33 +101,27 @@
 
     <itemizedlist>
       <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_runtime_open_source/1)" />.</para>
-      </listitem>
-
-      <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_management_open_source/1)" />.</para>
+        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_runtime_open_source/1)" /></para>
       </listitem>
 
       <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_telemetry_open_source/1)" />.</para>
+        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_management_open_source/1)" /></para>
       </listitem>
 
       <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_automation_open_source/1)" />.</para>
+        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_telemetry_open_source/1)" /></para>
       </listitem>
 
       <listitem>
-        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_auto_fw_th_open_source/1)" />.</para>
+        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_automation_open_source/1)" /></para>
       </listitem>
     </itemizedlist>
   </section>
@@ -213,9 +130,6 @@
     <title>Compatibility</title>
 
     <para>This release does not contain any public API changes impacting
-    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>
+    backwards compatibility.</para>
   </section>
 </chapter>
\ No newline at end of file