1 files changed, 43 insertions, 53 deletions

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 10e36a6..63c2216 100644
--- a/doc/book-enea-edge-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -31,21 +31,21 @@
       </listitem>
 
       <listitem>
-        <para><remark>CPDX-3500</remark>The Enea Edge Automation,
-        a tool for automatic system configuration based on Python
-        scripting that will replace the existing Enea Edge Automation
-        Framework and Test Harness in the next major release.</para>
+        <para><remark>CPDX-3500</remark>The Enea Edge Automation, a tool for
+        automatic system configuration based on Python scripting that will
+        replace the existing Enea Edge Automation Framework and Test Harness
+        in the next major release.</para>
 
-        <para>The Enea Edge Automation Framework and Test Harness, and
-        its related documentation the <xi:include
+        <para>The Enea Edge Automation Framework and Test Harness, and its
+        related documentation the <xi:include
         href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />
-        and the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /> and the
+        <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
-        are deprecated starting with Enea Edge 2.4.0.</para>
-      </listitem>         
+        xpointer="element(book_enea_edge_system_test_specification/1)" /> are
+        deprecated starting with Enea Edge 2.4.0.</para>
+      </listitem>
     </itemizedlist>
 
     <para><emphasis role="bold">Improvements:</emphasis></para>
@@ -75,38 +75,30 @@
     <itemizedlist>
       <listitem>
         <para><remark>CPDX-3498</remark>High Availability support with
-        redundant Enea uCPE Managers in active standby configuration.</para>
-
-        <para>In order to increase resiliency on the uCPE management side, 
-          the Enea uCPE Manager can be installed in High-Availability mode. 
-          Deployment consists of multiple instances of the Enea uCPE Manager, 
-          which can be distributed across different Data Centers and 
-          geographical locations, and with multiple MariaDB servers for 
-          each location.</para>
+        redundant Enea Edge Management applications in active standby
+        configuration.</para>
+
+        <para>In order to increase resiliency on the uCPE management side, the
+        Enea Edge Management application can be installed in High-Availability
+        mode. Deployment consists of multiple instances of the Enea Edge
+        Management application, which can be distributed across different Data
+        Centers and geographical locations, and with multiple MariaDB servers
+        for each location.</para>
       </listitem>
 
       <listitem>
-        <para>Platform and VNF Snapshots:</para>
-
-        <note>
-          <para>Made originally available with Enea NFV Access 2.3.0.</para>
-        </note>
+        <para>Platform and VNF Snapshots (made originally available starting 
+          with Enea NFV Access 2.3.0).</para>
+        
+        <para>Platform Snapshots allow users to store, manage and restore
+            snapshots of the Enea Edge Runtime configuration, with the purpose
+            of recovering after a failed reconfiguration. This feature is
+            disabled by default.</para>
 
-        <itemizedlist>
-          <listitem>
-            <para>Platform Snapshots allow users to store, manage and restore
-            snapshots of the Enea Edge Runtime configuration,
-            with the purpose of recovering after a failed reconfiguration.
-            This feature is disabled by default.</para>
-          </listitem>
-
-          <listitem>
             <para>VNF Snapshots allow users to store, manage and restore
-            snapshots of VNFs deployed on the Enea Edge 
-            Runtime, with the purpose of restoring the VNF after a persistent
-            VNF failure. This feature is disabled by default.</para>
-          </listitem>
-        </itemizedlist>
+            snapshots of VNFs deployed on the Enea Edge Runtime, with the
+            purpose of restoring the VNF after a persistent VNF failure. This
+            feature is disabled by default.</para>
 
         <note>
           <para>Users that would like to try out the Snapshot features should
@@ -133,36 +125,34 @@
 
     <itemizedlist>
       <listitem>
-
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_platform_open_source/1)"
-        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
+        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"
-        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)"
-        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_management_open_source/1)" />.</para>
       </listitem>
-          
-          <listitem>
+
+      <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_telemetry_open_source/1)"
-        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="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"
-        xpointer="element(book_enea_nfv_access_auto_fw_open_source/1)"
-        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_automation_open_source/1)" />.</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)"
-        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
-      </listitem>         
-
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_edge_auto_fw_th_open_source/1)" />.</para>
+      </listitem>
     </itemizedlist>
   </section>