3 files changed, 77 insertions, 89 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 960f136..766c02a 100644
--- a/doc/book-enea-edge-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -4,11 +4,11 @@
 <chapter id="relinfo-about-release">
   <title>About This Release</title>
 
-  <para>Enea Edge is a complete NFVI software platform designed for
-  deployment on any white box uCPE device, and optimized for common use cases.
-  Enea Edge includes both the Enea Edge Runtime deployed on a white box,
-  and a management component with automation tools deployed in a private or
-  public cloud.</para>
+  <para>Enea Edge is a complete NFVI software platform designed for deployment
+  on any white box uCPE device, and optimized for common use cases. Enea Edge
+  includes both the Enea Edge Runtime deployed on a white box, and a
+  management component with automation tools deployed in a private or public
+  cloud.</para>
 
   <para>The Enea Edge <xi:include
   href="../../s_doceneacommon/doc/eltf_params_updated.xml"
@@ -48,11 +48,11 @@
       <listitem>
         <para>VNF_example_configurations.tar.gz</para>
       </listitem>
-      
+
       <listitem>
-        <para>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip 
-          (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New Features and
-  Improvements</xref>.)</para>
+        <para>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip
+        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
+        Features and Improvements</xref>.)</para>
       </listitem>
     </itemizedlist>
 
@@ -109,63 +109,61 @@
 
     <itemizedlist>
       <listitem>
-        <para>Enea Edge Release Information. Describes the Enea Edge
-        release content, main changes, the list of known issues and
+        <para>Enea Edge Release Information. Describes the Enea Edge release
+        content, main changes, the list of known issues and
         limitations.</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_nfv_access_getting_started/1)" />.
-        Describes how to deploy and upgrade an Enea Edge base
-        configuration, advanced configurations of the system and
-        troubleshooting information.</para>
+        xpointer="element(book_enea_edge_getting_started/1)" />. Describes how
+        to deploy and upgrade an Enea Edge base configuration, advanced
+        configurations of the system as well as troubleshooting
+        information.</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_nfv_access_example_usecases/1)" />.
-        Describes examples of onboarding, instantiating and configuring
-        various VNFs.</para>
+        xpointer="element(book_enea_edge_example_usecases/1)" />. Describes
+        examples of onboarding, instantiating and configuring various
+        VNFs.</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_nfv_access_auto_fw_user_guide/1)" />. 
-                Describes the Automation Framework for Enea Edge.</para>
+        xpointer="element(book_enea_edge_automation_user_guide/1)" />.
+        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"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)"
-        xmlns:xi="http://www.w3.org/2001/XInclude" />. Describes the 
-          Automation Framework and Test Harness for Enea Edge and 
-          provides instructions regarding the necessary steps to run these 
-          software tools (deprecated, see 
-          <xref linkend="relinfo-changes-other">Section 2.1 New Features 
-            and Improvements</xref>).</para>
+        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>
       </listitem>
-          
+
       <listitem>
         <para><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)" />.
+        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, see <xref linkend="relinfo-changes-other">Section 2.1 New
+        Features and Improvements</xref>).</para>
       </listitem>
     </itemizedlist>
   </section>
 
   <section id="release-browsers">
     <title>Supported Web Browsers</title>
-        
-        <remark>These need to be updated</remark>
 
-    <para>The current release supports using the following web browsers:</para>
+    <para>The current release supports using the following web
+    browsers:</para>
 
     <itemizedlist>
       <listitem>
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 1f5fb0c..4f3eb7a 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
@@ -201,11 +201,11 @@
       <para><remark>ELCCR-1468</remark>When using the Enea Edge Management in
       HTTPS mode, upgrading a device from NFV Access 2.3.0 is not possible.
       Either switch to HTTP mode (for more details see <olink
-      targetdoc="book_enea_nfv_access_getting_started"
+      targetdoc="book_enea_edge_getting_started"
       targetptr="device_up_process">The uCPE device Upgrade Process in the
       <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+      xpointer="element(book_enea_edge_getting_started/1)" /></olink>
       Manual) or install it manually.</para>
     </listitem>
   </itemizedlist>
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>