2 files changed, 27 insertions, 141 deletions

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 bb408d8..da2f7eb 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,19 +4,6 @@
 <chapter id="bugs-limitations">
   <title>Known Issues and Limitations in this Release</title>
 
-  <note>
-    <para>All issues may also affect previous releases.</para>
-  </note>
-
-  <itemizedlist>
-    <listitem>
-      <para>???</para>
-    </listitem>
-  </itemizedlist>
-
-  <para><emphasis role="bold">Limitations detected in previous releases, that
-  still affect this release:</emphasis></para>
-
   <itemizedlist>
     <listitem>
       <para><remark>ELCCR-1688, ELCCR-1809</remark>It is possible to end up
@@ -156,12 +143,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>
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 3727330..9fd80a5 100644
--- a/doc/book-enea-edge-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -27,19 +27,6 @@
       </listitem>
 
       <listitem>
-        <para>Support for uCPE management plane redundancy, with automatic
-        failover between a primary and secondary management connection. For
-        more details please see <olink
-        targetdoc="book_enea_edge_getting_started"
-        targetptr="high_availability_ig">Installing the Enea Edge Management
-        application in High Availability Mode 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. This feature is currently available upon request.</para>
-      </listitem>
-
-      <listitem>
         <para>Support for Whitelabeling of the Enea Edge Management
         application to replace Enea branding elements with custom logos. For
         more details please see <olink
@@ -64,86 +51,9 @@
 
     <para><emphasis role="bold">Removed Features:</emphasis></para>
 
-    <para>The deprecated Enea Edge Automation Framework and Test Harness,
-    along with its User Guide and Open Source report, as well as the System
-    Test Specification Manual are no longer supported and have been removed
-    from the release.</para>
-
-    <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"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_getting_started/1)" /></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>
-
-          <listitem>
-            <para>QEMU 5.2.0</para>
-          </listitem>
-
-          <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>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>The deprecated Enea Edge Automation Framework and Test Harness
+    component is no longer supported and has been removed from the
+    release.</para>
 
     <para><emphasis role="bold">Early Access Features:</emphasis></para>
 
@@ -152,11 +62,6 @@
 
     <itemizedlist>
       <listitem>
-        <para>Support in the Enea Edge Management application to display uCPE
-        devices on a geographical map.</para>
-      </listitem>
-
-      <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
@@ -169,15 +74,21 @@
         Centers and geographical locations, and with multiple MariaDB servers
         for each location.</para>
       </listitem>
+
+      <listitem>
+        <para>Support in the Enea Edge Management application to display uCPE
+        devices on a geographical map.<remark>CPDX-3512</remark></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>
+
     <para>Early Access Features are not described in the standard
-    documentation. Please contact Enea Support for documentation specific to
-    Early Access features. They are provided for evaluation and early
-    feedback, and 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>
+    documentation. Please contact Enea Support for documentation.</para>
   </section>
 
   <section id="open_source">
@@ -190,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"
+        xpointer="element(book_enea_edge_runtime_open_source/1)"
+        xmlns:ns="http://www.w3.org/2001/XInclude" /></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"
+        xpointer="element(book_enea_edge_management_open_source/1)"
+        xmlns:ns="http://www.w3.org/2001/XInclude" /></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"
+        xpointer="element(book_enea_edge_telemetry_open_source/1)"
+        xmlns:ns="http://www.w3.org/2001/XInclude" /></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"
+        xpointer="element(book_enea_edge_automation_open_source/1)"
+        xmlns:ns="http://www.w3.org/2001/XInclude" /></para>
       </listitem>
     </itemizedlist>
   </section>