36 files changed, 1311 insertions, 1105 deletions
diff --git a/doc/Makefile b/doc/Makefile
index 1a1bd48..95cc7eb 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -23,13 +23,13 @@ include init.mk
 # ******************* AutoGenerated chapters from template and target READMEs *******
-#BUILDBOOT_XML       := book-enea-nfv-access-release-info/doc/build_boot_generated.xml
+#BUILDBOOT_XML       := book-enea-edge-release-info/doc/build_boot_generated.xml
-#BUILDBOOT_TEMPLATE  := book-enea-nfv-access-release-info/doc/build_boot_template.xml
+#BUILDBOOT_TEMPLATE  := book-enea-edge-release-info/doc/build_boot_template.xml
-#PKGDIFF_GEN_XML     := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml
+#PKGDIFF_GEN_XML     := book-enea-edge-release-info/doc/pkgdiff_generated.xml
-#JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml
+#JIRA_ISSUES_GEN_XML := book-enea-edge-release-info/doc/jiraissues_generated.xml
-MACHINE_LIST_XML    := book-enea-nfv-access-release-info/doc/machine_list_generated.xml
+MACHINE_LIST_XML    := book-enea-edge-release-info/doc/machine_list_generated.xml
 ELTF_PARAMS_TEMPLATE := s_doceneacommon/doc/eltf_params_template.xml
 ELTF_PARAMS_UPDATED  := s_doceneacommon/doc/eltf_params_updated.xml
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 4fe1c9a..9f6e64f 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="auto_fw_test_harness">
  <title>Automation Framework and Test Harness</title>
@@ -11,15 +11,16 @@
    <para>The <literal>/device</literal> folder contains Python scripts for
    adding uCPE device(s), receiving uCPE events' reports, removing a uCPE
-    device, waiting for a uCPE device to connect to the Enea Edge Management, as well
+    device, waiting for a uCPE device to connect to the Enea Edge Management
-    as scripts for adding and removing an offline configuration store. This
+    application, as well as scripts for adding and removing an offline
-    folder also contains scripts for uploading and removing an NFVA image into
+    configuration store. This folder also contains scripts for uploading and
-    the Enea Edge Management, and for installing and activating a NFVA image on a uCPE
+    removing an NFVA image into the Enea Edge Management application, and for
-    Device.</para>
+    installing and activating a NFVA image on a uCPE Device.</para>
    <para>The <literal>/customScripts</literal> folder contains Python scripts
-    for uploading custom scripts onto the Enea Edge Management and uCPE device(s), for
+    for uploading custom scripts onto the Enea Edge Management application and
-    removing custom scripts from the Enea Edge Management and uCPE device(s).</para>
+    uCPE device(s), for removing custom scripts from the Enea Edge Management
+    application and uCPE device(s).</para>
    <para>The <literal>/network</literal> folder contains Python scripts for
    binding or unbinding a network interface to and from a uCPE device (DPDK
@@ -32,14 +33,20 @@
      <para>Commands within the network folder that include the option
      <emphasis role="bold">-o</emphasis> allow the user to perform the action
      in an offline configuration store alternative available for use at a
-      later setup time.</para> 
+      later setup time.</para>
-      <para>Commands that include the <emphasis role="bold">-n</emphasis> 
-      option refer to a uCPE device, with the operation being performed on uCPE device.</para> 
+      <para>Commands that include the <emphasis role="bold">-n</emphasis>
-      <para>All options contain either <emphasis role="bold">-n</emphasis>, 
+      option refer to a uCPE device, with the operation being performed on
-      <emphasis role="bold">-o</emphasis> or both. One of them must always be provided, 
+      uCPE device.</para>
-      if both are provided, -o has priority, and -n is thus ignored.</para>
-      <para>In the following script examples, <emphasis> Enea Edge Management 
+      <para>All options contain either <emphasis role="bold">-n</emphasis>,
-      </emphasis> is reffered as <emphasis>Enea uCPE Manager</emphasis>.</para>
+      <emphasis role="bold">-o</emphasis> or both. One of them must always be
+      provided, if both are provided, -o has priority, and -n is thus
+      ignored.</para>
+      <para>In the following script examples, <emphasis>Enea Edge Management
+      </emphasis> is reffered as <emphasis>Enea uCPE
+      Manager</emphasis>.</para>
    </note>
    <para>The <literal>/unittestSuite</literal> folder contains JSON files for
@@ -81,8 +88,8 @@
      the path to the file describing the test cases to be performed against
      the designated script.</para>
-      <para>Steps for running the Python unit-test suite on the Enea Edge Management
+      <para>Steps for running the Python unit-test suite on the Enea Edge
-      are provided below.</para>
+      Management application are provided below.</para>
      <section id="script_opts">
        <title>Script Options</title>
@@ -236,26 +243,27 @@ consoleLoggingLevel = logging.INFO
              <row>
                <entry><literal>username</literal></entry>
-                <entry>The user authentication used to log into the
+                <entry>The user authentication used to log into the Enea Edge
-                Enea Edge Management. This can be overwritten by setting the Python
+                Management application. This can be overwritten by setting the
-                unit-test suite command line option
+                Python unit-test suite command line option
                <literal>-u</literal>.</entry>
              </row>
              <row>
                <entry><literal>password</literal></entry>
-                <entry>The password used to log into the Enea Edge Management. This
+                <entry>The password used to log into the Enea Edge Management
-                can be overwritten by setting the Python unit-test suite
+                application. This can be overwritten by setting the Python
-                command line option <literal>-p</literal>.</entry>
+                unit-test suite command line option
+                <literal>-p</literal>.</entry>
              </row>
              <row>
                <entry><literal>host</literal></entry>
-                <entry>The IP address of the Enea Edge Management host. This can be
+                <entry>The IP address of the Enea Edge Management application
-                overwritten by setting the Python unit-test suite command line
+                host. This can be overwritten by setting the Python unit-test
-                option <literal>-H</literal>.</entry>
+                suite command line option <literal>-H</literal>.</entry>
              </row>
              <row>
@@ -541,8 +549,8 @@ OK</programlisting>
    <section id="add_ucpe_device">
      <title>Adding a uCPE Device</title>
-      <para>Steps for adding, configuring and running a uCPE device onto the
+      <para>Steps for adding, configuring and running a uCPE device into the
-      Enea Edge Management are described below .</para>
+      Enea Edge Management application are described below .</para>
      <section id="opts_add_device">
        <title>Script Options</title>
@@ -626,8 +634,8 @@ Options:
    <section id="remove_ucpe_device">
      <title>Removing a uCPE Device</title>
-      <para>Steps for removing a uCPE device from the Enea Edge Management are
+      <para>Steps for removing a uCPE device from the Enea Edge Management
-      described below.</para>
+      application are described below.</para>
      <section id="rem_script_opts">
        <title>Script Options</title>
@@ -703,7 +711,8 @@ host
      <title>Waiting a uCPE Device</title>
      <para>Steps and details for how to Wait a uCPE device to connect to the
-      Enea Edge Management after installation, are described below.</para>
+      Enea Edge Management application after installation, are described
+      below.</para>
      <section id="wait_script_opts">
        <title>Script Options</title>
@@ -781,7 +790,8 @@ Options:
      <title>Printing the uCPE Device Log</title>
      <para>Steps and details on how to Print the events log for a specific
-      uCPE device installed in the Enea Edge Management, are explained below.</para>
+      uCPE device installed in the Enea Edge Management application, are
+      explained below.</para>
      <section id="print_script_opts">
        <title>Script Options</title>
@@ -1382,8 +1392,8 @@ Options:
    <section id="onboard_vnf_image">
      <title>Onboarding a VNF Image Raw</title>
-      <para>How to Onboard a VNF image in the Enea Edge Management based upon its raw
+      <para>How to Onboard a VNF image in the Enea Edge Management application
-      constituents, is detailed in depth below.</para>
+      based upon its raw constituents, is detailed in depth below.</para>
      <section id="script_opts_image">
        <title>Script Options</title>
@@ -1499,8 +1509,8 @@ Options:
    <section id="offboard_vnf">
      <title>Offboarding a VNF</title>
-      <para>Steps on how to Offboard a VNF from the Enea Edge Management are detailed
+      <para>Steps on how to Offboard a VNF from the Enea Edge Management
-      below.</para>
+      application are detailed below.</para>
      <section id="script_opts_offimage">
        <title>Script Options</title>
@@ -1565,7 +1575,8 @@ Options:
    <section id="instantiate_vnf">
      <title>Instantiating a VNF</title>
-      <para>Instantiating a VNF via the Enea Edge Management is detailed below.</para>
+      <para>Instantiating a VNF via the Enea Edge Management application is
+      detailed below.</para>
      <section id="script_opts_inst">
        <title>Script Options</title>
@@ -1644,8 +1655,8 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
    <section id="control_vnf_inst">
      <title>Controlling a VNF Instance</title>
-      <para>How to Control a VNF instance from the Enea Edge Management is
+      <para>How to Control a VNF instance from the Enea Edge Management
-      detailed below.</para>
+      application is detailed below.</para>
      <note>
        <para>If a sequence of commands aiming to change the state of the VNF
@@ -1653,7 +1664,8 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
        become unresponsive. Depending on the actual VNF, the time required
        between life-cycle operations may vary from several seconds to half a
        minute or even more. If a VNF becomes unresponsive, the only possible
-        action is to "Force Delete" the instance from the Enea Edge Management.</para>
+        action is to "Force Delete" the instance from the Enea Edge Management
+        application.</para>
      </note>
      <section id="script_opts_control">
@@ -1803,10 +1815,11 @@ fortigateFWInstance
    </section>
    <section id="upload_vnf_image">
-      <title>Uploading an Enea Edge image onto the Enea Edge Management</title>
+      <title>Uploading an Enea Edge image onto the Enea Edge Management
+      application</title>
      <para>Steps and options on how to Upload an Enea Edge image onto the
-      Enea Edge Management are described below.</para>
+      Enea Edge Management application are described below.</para>
      <section id="script_opts_upload">
        <title>Script Options</title>
@@ -1876,11 +1889,11 @@ Options:
    </section>
    <section id="delete_vnf_image">
-      <title>Deleting an Enea Edge image file from the
+      <title>Deleting an Enea Edge image file from the Enea Edge Management
-      Enea Edge Management</title>
+      application</title>
      <para>Steps and options on how to Delete an Enea Edge image from the
-      Enea Edge Management are described below.</para>
+      Enea Edge Management application are described below.</para>
      <section id="script_opts_deleteupload">
        <title>Script Options</title>
@@ -1951,11 +1964,11 @@ image was successfully removed
    <section id="install_activate_vnf_image">
      <title>Installing and activating an Enea Edge image on an uCPE device
-      from the Enea Edge Management</title>
+      from the Enea Edge Management application</title>
      <para>Steps and options on how to Install and Activate an Enea Edge
-      image on an uCPE device from the Enea Edge Management are described
+      image on an uCPE device from the Enea Edge Management application are
-      below.</para>
+      described below.</para>
      <section id="script_opts_install_activate">
        <title>Script Options</title>
@@ -1991,10 +2004,10 @@ Options:
      <section id="json_install_activate">
        <title>Configuring the JSON File</title>
-        <para>The JSON configuration file needed to install and activate an Enea Edge
+        <para>The JSON configuration file needed to install and activate an
-        image on a uCPE device from the Enea Edge Management should
+        Enea Edge image on a uCPE device from the Enea Edge Management
-        contain a list of dictionaries. Each dictionary indicates the test
+        application should contain a list of dictionaries. Each dictionary
-        case name and the test case arguments passed to the
+        indicates the test case name and the test case arguments passed to the
        <filename>installAndActivate</filename> Python module.</para>
        <para><emphasis role="bold">Sample unit-test JSON file
@@ -2057,11 +2070,11 @@ enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [20]
    <section id="clearing_info_upgrade">
      <title>Clearing information about completed upgrades of uCPE devices
-      from the Enea Edge Management</title>
+      from the Enea Edge Management application</title>
      <para>Steps and options on how to clear information about completed
-      upgrades of uCPE devices from the Enea Edge Management are described
+      upgrades of uCPE devices from the Enea Edge Management application are
-      below.</para>
+      described below.</para>
      <section id="script_opts_clearinfo">
        <title>Script Options</title>
@@ -2089,9 +2102,9 @@ Options:
        <title>Configuring the JSON File</title>
        <para>No JSON configuration file is needed to clear information about
-        completed upgrades of uCPE devices from the Enea Edge Management. The
+        completed upgrades of uCPE devices from the Enea Edge Management
-        <filename>clearCompletedUpgradesInfo</filename> Python module can be
+        application. The <filename>clearCompletedUpgradesInfo</filename>
-        run without a JSON file as a parameter.</para>
+        Python module can be run without a JSON file as a parameter.</para>
      </section>
      <section id="pymod_clear_info">
@@ -2112,10 +2125,11 @@ Options:
    </section>
    <section id="upload_custom_script">
-      <title>Uploading a Custom Script to the Enea Edge Management</title>
+      <title>Uploading a Custom Script to the Enea Edge Management
+      application</title>
-      <para>Steps and options on how to upload a custom script to the
+      <para>Steps and options on how to upload a custom script to the Enea
-      Enea Edge Management are described below.</para>
+      Edge Management application are described below.</para>
      <section id="script_opts_upload_custom_script">
        <title>Script Options</title>
@@ -2149,8 +2163,9 @@ Options:
        <title>Configuring the JSON File</title>
        <para>The JSON configuration file needed to upload a Custom Script to
-        the Enea Edge Management must contain a list of dictionaries. Each dictionary
+        the Enea Edge Management application must contain a list of
-        indicates the test case name and the test case arguments passed to the
+        dictionaries. Each dictionary indicates the test case name and the
+        test case arguments passed to the
        <filename>customScripts/upload</filename> Python module.</para>
        <para><emphasis role="bold">Sample unit-test JSON file
@@ -2186,11 +2201,11 @@ echo test_success_after_always
    </section>
    <section id="upload_custom_script_device">
-      <title>Uploading a Custom Script from the Enea Edge Management to a
+      <title>Uploading a Custom Script from the Enea Edge Management
-      Device</title>
+      application to a Device</title>
-      <para>Steps and options on how to upload a custom script from the
+      <para>Steps and options on how to upload a custom script from the Enea
-      Enea Edge Management to a Device are described below.</para>
+      Edge Management application to a Device are described below.</para>
      <section id="script_opts_upload_custom_script_device">
        <title>Script Options</title>
@@ -2227,9 +2242,9 @@ Options:
        <title>Configuring the JSON File</title>
        <para>The JSON configuration file needed to upload a Custom Script
-        from the Enea Edge Management to a Device must contain a list of dictionaries.
+        from the Enea Edge Management application to a Device must contain a
-        Each dictionary indicates the test case name and the test case
+        list of dictionaries. Each dictionary indicates the test case name and
-        arguments passed to the
+        the test case arguments passed to the
        <filename>customScripts/uploadOnDevice</filename> Python
        module.</para>
@@ -2265,10 +2280,11 @@ test_success_after_always -e always-after-startup -n inteld1521-6
    </section>
    <section id="delete_custom_script">
-      <title>Removing a Custom Script from the Enea Edge Management</title>
+      <title>Removing a Custom Script from the Enea Edge Management
+      application</title>
-      <para>Steps and options on how to remove a custom script from the
+      <para>Steps and options on how to remove a custom script from the Enea
-      Enea Edge Management are described below.</para>
+      Edge Management application are described below.</para>
      <section id="script_opts_delete_custom_script">
        <title>Script Options</title>
@@ -2302,9 +2318,10 @@ Options:
        <title>Configuring the JSON File</title>
        <para>The JSON configuration file needed to remove a Custom Script
-        from the Enea Edge Management<remark>did you mean device or
+        from the Enea Edge Management application<remark>did you mean device
-        Enea Edge Management?</remark> must contain a list of dictionaries. Each dictionary
+        or Enea Edge Management application?</remark> must contain a list of
-        indicates the test case name and the test case arguments passed to the
+        dictionaries. Each dictionary indicates the test case name and the
+        test case arguments passed to the
        <filename>customScripts/delete</filename> Python module.</para>
        <para><emphasis role="bold">Sample unit-test JSON file
@@ -2418,7 +2435,8 @@ phase always-after-startup from inteld1521-6
    <section id="custom_script_eg">
      <title>Custom Script - Full Example</title>
-      <para>All Python API used in this example are described in detail in the following sections.</para>
+      <para>All Python API used in this example are described in detail in the
+      following sections.</para>
      <para>The list of custom scripts can be found in
      <literal>&lt;AF-TH-install-dir&gt;/lab_config/customScripts</literal>:</para>
@@ -2471,7 +2489,8 @@ phase always-after-startup from inteld1521-6
      </note>
      <section id="upload_customscrp_ucpemg">
-        <title>Uploading a Custom Script to the Enea Edge Management</title>
+        <title>Uploading a Custom Script to the Enea Edge Management
+        application</title>
        <programlisting>$ python automation_framework/customScripts/upload.py \
 -f lab_config/customScripts/test_success_after_always -e always-after-startup
@@ -2487,8 +2506,8 @@ echo test_success_after_always
      </section>
      <section id="upload_customscrp_device">
-        <title>Uploading a Custom Script from the Enea Edge Management to a
+        <title>Uploading a Custom Script from the Enea Edge Management
-        Device</title>
+        application to a Device</title>
        <programlisting>$ python automation_framework/customScripts/uploadOnDevice.py -c \
 test_success_after_always -e always-after-startup -n inteld1521-6
@@ -2519,7 +2538,8 @@ phase always-after-startup from inteld1521-6
      </section>
      <section id="remove_customscrp_ucpemg">
-        <title>Removing a Custom Script from the Enea Edge Management</title>
+        <title>Removing a Custom Script from the Enea Edge Management
+        application</title>
        <programlisting>$ python automation_framework/customScripts/delete.py -c \
 test_success_after_always -e always-after-startup
@@ -2538,15 +2558,15 @@ phase always-after-startup from uCPE Manager
    <section id="add_offline_config_store">
      <title>Adding an Offline Configuration Store</title>
-      <para>Steps and options on how to add a Config Store in the
+      <para>Steps and options on how to add a Config Store in the Enea Edge
-      Enea Edge Management are described below.</para>
+      Management application are described below.</para>
      <section id="script_opts_add_config_store">
        <title>Script Options</title>
-        <para>To add a config store in the Enea Edge Management use the
+        <para>To add a config store in the Enea Edge Management application
-        <filename>addConfigStore.py</filename> script detailed below. Bear in
+        use the <filename>addConfigStore.py</filename> script detailed below.
-        mind a <filename>CONFIGSTORE</filename> json file is needed to
+        Bear in mind a <filename>CONFIGSTORE</filename> json file is needed to
        successfully run the script in order to add an offline configuration
        store.</para>
      </section>
@@ -2568,8 +2588,8 @@ phase always-after-startup from uCPE Manager
      <section id="runpy_add_config_store">
        <title>Running the Python Module</title>
-        <para>Adding an offline config store in the Enea Edge Management using
+        <para>Adding an offline config store in the Enea Edge Management
-        the command line:</para>
+        application using the command line:</para>
        <programlisting>python automation_framework/device/addConfigStore.py -f \
 lab_config/inteld1521-16/store.json
@@ -2672,18 +2692,18 @@ Options:
    </section>
    <section id="remove_offline_config_store">
-      <title>Removing an Offline Configuration Store in the
+      <title>Removing an Offline Configuration Store in the Enea Edge
-      Enea Edge Management</title>
+      Management application</title>
      <para>Steps and options on how to remove an upload of a Config Store
-      from the Enea Edge Management are described below.</para>
+      from the Enea Edge Management application are described below.</para>
      <note>
        <para>Modifications of an Offline Configurations Store are not
-        possible post deployment in the Enea Edge Management, as there is no option
+        possible post deployment in the Enea Edge Management application, as
-        for changing script states (e.g. changing the DPDK state in the
+        there is no option for changing script states (e.g. changing the DPDK
-        <filename>configDPDK.py</filename> python script or unbinding
+        state in the <filename>configDPDK.py</filename> python script or
-        interfaces). The offline store must be deleted and the new
+        unbinding interfaces). The offline store must be deleted and the new
        state(s)/changes added in, before being deployed anew. This was not
        deemed necessary for the current ZTP functionality.</para>
      </note>
@@ -2691,9 +2711,9 @@ Options:
      <section id="script_opts_remove_config_store">
        <title>Script options</title>
-        <para>To remove a config store from the Enea Edge Management use the
+        <para>To remove a config store from the Enea Edge Management
-        <filename>removeConfigStore.py</filename> script detailed
+        application use the <filename>removeConfigStore.py</filename> script
-        below.</para>
+        detailed below.</para>
        <programlisting>python removeConfigStore.py -h
 Usage: removeConfigStore.py [options]
@@ -2772,9 +2792,9 @@ Options:
    Manual.</para>
    <para>The /<literal>uCPEM_config</literal> directory stores JSON
-    configuration files needed for the setup of the Enea Edge Management used by TH.
+    configuration files needed for the setup of the Enea Edge Management
-    One configuration file is needed per Enea Edge Management installation, to be used
+    application used by TH. One configuration file is needed per Enea Edge
-    in the TH.</para>
+    Management installation, to be used in the TH.</para>
    <para>The <literal>/vnf_image</literal> directory stores the VNF Images
    needed by the Ansible Playbooks (i.e. the sample test cases).</para>
@@ -2799,4 +2819,4 @@ Options:
    <filename>ansible.log</filename> and <filename>debug.log</filename> files,
    respectively.</para>
  </section>
-</chapter>
+</chapter>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
index a1ffed1..d533a74 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
@@ -1,33 +1,32 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
 <book id="book_enea_edge_auto_fw_th_user_guide">
-  <title><trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness User Guide</title>
+  <title><trademark class="registered">Enea</trademark> Edge Automation
+  Framework and Test Harness User Guide</title>
-  <subtitle>Release Version
+  <subtitle>Release Version <xi:include
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
  <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="overview.xml"
+  <xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="getting_started.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="components.xml"
+  <xi:include href="components.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="automation_framework_test_harness.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="troubleshooting_guide.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+\ No newline at end of file
-</book>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
index 60675a8..94ee384 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="components">
  <title>Components</title>
-  <para>An overview of the Enea Edge Runtime and the Edge Management
+  <para>An overview of the Enea Edge Runtime and the Edge Management in
-  in cooperation with the Enea Edge Automation Framework and Test Harness, will
+  cooperation with the Enea Edge Automation Framework and Test Harness, will
  be presented in detail.</para>
  <figure>
@@ -20,22 +20,23 @@
  <section id="enfva_runtime_plt">
    <title>Enea Edge</title>
-    <para>Enea Edge is comprised of the Enea Edge Management and the Enea
+    <para>Enea Edge is comprised of the Enea Edge Management application and
-    Edge Runtime.</para>
+    Enea Edge Runtime.</para>
    <section id="eucpe_manager">
      <title>Enea Edge Management</title>
      <para>The Enea Edge Management application needs to be installed on a
      supported platform. Upon installation, the system will be set up to
-      manage Enea Edge Runtime "devices", these are the virtualized CPE devices
+      manage Enea Edge Runtime "devices", these are the virtualized CPE
-      used in testing.</para>
+      devices used in testing.</para>
      <para>For more on Enea Edge Management installation instructions, please
      refer to the section on how to <olink
      targetdoc="book_enea_edge_getting_started"
-      targetptr="install_ucpe_mg">Installing the Enea Edge Management in the
+      targetptr="install_ucpe_mg">Installing the Enea Edge Management
-      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+      application 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>
@@ -44,13 +45,15 @@
    <section id="ena_plat">
      <title>Enea Edge Runtime</title>
-      <para>One or more uCPE devices running the Enea Edge Runtime
+      <para>One or more uCPE devices running the Enea Edge Runtime are
-      are required as hosts to run the VNF(s). The uCPE device is
+      required as hosts to run the VNF(s). The uCPE device is known to the
-      known to the Enea Edge Management as the "VcpeAgent" device module.</para>
+      Enea Edge Management application as the "VcpeAgent" device
+      module.</para>
      <note>
-        <para>Before running any use case with the Enea Edge Automation Framework and
+        <para>Before running any use case with the Enea Edge Automation
-        Test Harness, make sure the uCPE device(s) have been added to the Edge Management.</para>
+        Framework and Test Harness, make sure the uCPE device(s) have been
+        added to the Enea Edge Management application.</para>
      </note>
      <para>Adding a VcpeAgent device can be done via two methods:</para>
@@ -69,8 +72,8 @@
        </listitem>
      </itemizedlist>
-      <para>For more on Enea Edge installation instructions, please
+      <para>For more on Enea Edge installation instructions, please refer to
-      refer to chapter <olink targetdoc="book_enea_edge_getting_started"
+      chapter <olink targetdoc="book_enea_edge_getting_started"
      targetptr="prep_usb_ena">Preparing the USB stick for installation of the
      Enea Edge Runtime in the <xi:include
      href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -83,16 +86,17 @@
  <section id="automation">
    <title>Automation Framework</title>
-    <para>Testing can be performed by running Automation Framework (AF) Python scripts
+    <para>Testing can be performed by running Automation Framework (AF) Python
-    against the Enea Edge Management REST API (Python samples supplied). This can be
+    scripts against the Enea Edge Management REST API (Python samples
-    done by using the Python scripts individually or by using the Python
+    supplied). This can be done by using the Python scripts individually or by
-    unit-test suite that is able to automatically run test-cases defined for
+    using the Python unit-test suite that is able to automatically run
-    each available Python script.</para>
+    test-cases defined for each available Python script.</para>
    <para>In either case, it is desirable to use a different host (instead of
-    running the tests on the same system as the Enea Edge Management) in order to
+    running the tests on the same system as the Enea Edge Management
-    ensure that the Enea Edge Management is setup and installed correctly in terms of
+    application) in order to ensure that the Enea Edge Management application
-    allowing external users to access it and use it effectively.</para>
+    is setup and installed correctly in terms of allowing external users to
+    access it and use it effectively.</para>
  </section>
  <section id="harness">
@@ -100,8 +104,8 @@
    <para>The Test Harness (TH) provides a way for driving configuration with
    Ansible Playbooks, by running the python modules from the Automation
-    Framework and by direct connection over SSH to the boards that run
+    Framework and by direct connection over SSH to the boards that run Enea
-    Enea Edge.</para>
+    Edge.</para>
    <para>The Test Harness includes an automated test suite that
    contains:</para>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
index 455e142..255138b 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="getting_started">
  <title>Getting Started with the Enea Edge Automation Framework and Test
  Harness</title>
@@ -6,8 +6,8 @@
  <section id="prerequisites">
    <title>Prerequisites</title>
-    <para>For installation of the Enea Edge Automation Framework and Test Harness a
+    <para>For installation of the Enea Edge Automation Framework and Test
-    CentOS 7 host machine is needed with support for:</para>
+    Harness a CentOS 7 host machine is needed with support for:</para>
    <itemizedlist>
      <listitem>
@@ -28,10 +28,10 @@
    </itemizedlist>
    <note>
-      <para>The Enea Edge Automation Framework and Test Harness installation may be done
+      <para>The Enea Edge Automation Framework and Test Harness installation
-      on the same machine used for Enea Edge Management installation, although this is
+      may be done on the same machine used for the Enea Edge Management
-      not encouraged. For more details see section <olink
+      installation, although this is not encouraged. For more details see
-      targetdoc="book_enea_edge_auto_fw_th_user_guide"
+      section <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
      targetptr="automation">Automation Framework in the <xi:include
      href="../../s_docbuild/olinkdb/pardoc-names.xml"
      xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -82,13 +82,14 @@
      </listitem>
      <listitem>
-        <para>Enea Edge Management installed.</para>
+        <para>Enea Edge Management application installed.</para>
        <note>
-          <para>For details on how to install the Enea Edge Management, see <olink
+          <para>For details on how to install the Enea Edge Management
-          targetdoc="book_enea_edge_getting_started"
+          application, see <olink targetdoc="book_enea_edge_getting_started"
-          targetptr="install_ucpe_mg">Installing the Enea Edge Management in the
+          targetptr="install_ucpe_mg">Installing the Enea Edge Management
-          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          application 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>
@@ -180,7 +181,8 @@
      </listitem>
      <listitem>
-        <para>Set up the Enea Edge Management which will be used by the TH:</para>
+        <para>Set up the Enea Edge Management application which will be used
+        by the TH:</para>
        <orderedlist spacing="compact">
          <listitem>
@@ -221,18 +223,18 @@
    <literal>&lt;AF-THinstall-dir&gt;</literal> directory.</para>
    <para>Subsequent use of the installation requires activating the Python
-    virtual enviroment before using the Enea Edge Automation Framework and Test Harness:
+    virtual enviroment before using the Enea Edge Automation Framework and
-    <literal>source
+    Test Harness: <literal>source
    &lt;AF-TH-install-dir&gt;/testHarness-venv/bin/activate</literal>.</para>
-    <para>Furthermore, if a user wants to use a new Enea Edge Management instance for
+    <para>Furthermore, if a user wants to use a new Enea Edge Management
-    a new session, the user also has to re-run the
+    instance for a new session, the user also has to re-run the
    <filename>setupuCPEManager.yml</filename> playbook with the corresponding
    JSON config for the new Enea Edge Management instance.</para>
    <note>
-      <para>Enea Edge Automation Framework and Test Harness History Information can be
+      <para>Enea Edge Automation Framework and Test Harness History
-      found in the AF&amp;TH CHANGELOG file available in:
+      Information can be found in the AF&amp;TH CHANGELOG file available in:
      <filename>&lt;AF-TH-install-dir&gt;/CHANGELOG</filename></para>
    </note>
  </section>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
index 4fec3d9..1d07512 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
@@ -1,21 +1,23 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="overview">
  <title>Overview</title>
-  <para>This document describes the Enea Edge Automation Framework and Test Harness, along with instructions regarding the necessary steps to
+  <para>This document describes the Enea Edge Automation Framework and Test
-  run these software tools.</para>
+  Harness, along with instructions regarding the necessary steps to run these
+  software tools.</para>
  <section id="descrip">
    <title>Description</title>
    <para>The Automation Framework provides a way for driving configuration
-    with Python scripting. It complements the Enea Edge Management GUI and uses
+    with Python scripting. It complements the Enea Edge Management GUI and
-    the northbound REST APIs, given to provide full usability of the Enea Management
+    uses the northbound REST APIs, given to provide full usability of the Enea
-    features.</para>
+    Management features.</para>
    <para>The Test Harness is based on running Ansible Playbooks to complete
    different test cases, which make use of the Automation Framework Python
-    modules and/or direct commands on the uCPE devices running the Enea Edge Runtime.</para>
+    modules and/or direct commands on the uCPE devices running the Enea Edge
+    Runtime.</para>
  </section>
  <section id="def_acro">
@@ -39,8 +41,7 @@
          <row>
            <entry>Enea Edge</entry>
-            <entry>The Enea Edge Runtime and the
+            <entry>The Enea Edge Runtime and the Enea Edge Management.</entry>
-            Enea Edge Management.</entry>
          </row>
        </tbody>
      </tgroup>
@@ -127,7 +128,6 @@
            <entry>Network Functions Virtualization.</entry>
          </row>
-         
          <row>
            <entry>OVS</entry>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
index a5cd664..1ed4d92 100644
--- a/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="troubleshooting_guide">
  <title>Troubleshooting Guide</title>
@@ -21,12 +21,12 @@
    </listitem>
    <listitem>
-      <para>When setting up the Enea Edge Management to be used by the TH through the
+      <para>When setting up the Enea Edge Management application to be used by
-      <literal>setupuCPEManager.yml</literal> Playbook, if the uCPE
+      the TH through the <literal>setupuCPEManager.yml</literal> Playbook, if
-      username/password/host are incorrect or are missing, all the Sample test
+      the uCPE username/password/host are incorrect or are missing, all the
-      cases will fail. If the FTP username/password/port are wrong or are
+      Sample test cases will fail. If the FTP username/password/port are wrong
-      missing, the tests that require file transfer to the Enea Edge Management will
+      or are missing, the tests that require file transfer to the Enea Edge
-      fail.</para>
+      Management application will fail.</para>
    </listitem>
    <listitem>
diff --git a/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
index 89692b0..993da22 100644
--- a/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
+++ b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_router_cust_uc">
  <title>128T VNF Router Example Use-case</title>
@@ -68,8 +68,9 @@
      <para><emphasis role="bold">Configuring Network Interfaces on uCPE
      devices:</emphasis><orderedlist>
          <listitem>
-            <para>Add the trgt uCPE device into Enea Edge Management:
+            <para>Add the trgt uCPE device into the Enea Edge Management
-            <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
+            application: <literal>Devices -&gt; Manage -&gt;
+            Add</literal>.</para>
            <para>Fill in the required fields with the following data:</para>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_1.xml b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
index df262af..8c76884 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_one_cust">
  <title>How to create a 128T cloud-init iso image (day-0
  configuration)</title>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_2.xml b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
index 2458d99..7ef7c41 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_two_cust">
  <title>How to create the 128T image for NFV Access</title>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_3.xml b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
index e8bd5ce..063483a 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_three_cust">
  <title>How to configure Fortigate VNF (day-0 configuration)</title>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index ef706ec..f52e33d 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_four_cust">
  <title>Running Enea Edge Automation Framework and Test Harness</title>
-  <para>For more detailed information regarding the Enea Edge Automation Framework and
+  <para>For more detailed information regarding the Enea Edge Automation
-  Test Harness please see the <xi:include
+  Framework and Test Harness please see the <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)" />.</para>
-  <para>The most relevant information from the Enea Edge Automation Framework and Test
+  <para>The most relevant information from the Enea Edge Automation Framework
-  Harness structure is presented below:</para>
+  and Test Harness structure is presented below:</para>
  <programlisting>|---automation_framework
 |  |---unittestSuite
@@ -78,16 +78,17 @@
  <note>
    <para>Before starting the two usecases detailed in the following appendix,
-    the uCPE Device needs to be added into Enea Edge Management.</para>
+    the uCPE Device needs to be added into the Enea Edge Management
+    application.</para>
  </note>
-  <para>To properly set up the Enea Edge Automation Framework and Test Harness please
+  <para>To properly set up the Enea Edge Automation Framework and Test Harness
-  see <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
+  please see <olink targetdoc="book_enea_edge_auto_fw_th_user_guide"
  targetptr="initial_setup">Installation and Initial Setup in the <xi:include
  href="../../s_docbuild/olinkdb/pardoc-names.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink>
+  xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /></olink> for
-  for more details.</para>
+  more details.</para>
  <para>To run a test:</para>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
index 67f38e5..abb4be8 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <appendix id="appendix_five_cust">
-  <title>Example Tests Results using the Automation Framework and Test Harness</title>
+  <title>Example Tests Results using the Automation Framework and Test
+  Harness</title>
  <para>In order to run the following example usecases, certain configuration
  file entries need to be modified according to the network setup that it will
@@ -39,8 +40,8 @@
    "maintMode": "false",
    "version": "2.2.3",
    "deviceId": "inteld1521-17"
-}</programlisting>The IP address of Enea Edge Management that will be used in
+}</programlisting>The IP address of Enea Edge Management application that will
-  these examples is <literal>172.24.3.92</literal>.</para>
+  be used in these examples is <literal>172.24.3.92</literal>.</para>
  <para>The FortiGate and 128T VNF images need to be copied into the
  <literal>vnf_image</literal> directory. The names should be the same as
diff --git a/doc/book-enea-edge-example-usecases/doc/book.xml b/doc/book-enea-edge-example-usecases/doc/book.xml
index 2ffbefe..fc69b88 100644
--- a/doc/book-enea-edge-example-usecases/doc/book.xml
+++ b/doc/book-enea-edge-example-usecases/doc/book.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
 <book id="book_enea_edge_example_usecases">
-  <title><trademark class="registered">Enea</trademark> Edge Example Use-cases</title>
+  <title><trademark class="registered">Enea</trademark> Edge Example
+  Use-cases</title>
-  <subtitle>Release Version
+  <subtitle>Release Version <xi:include
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
@@ -36,9 +38,7 @@
  <xi:include href="service_chaining_128t_fortigate.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="appendix_4.xml"
+  <xi:include href="appendix_4.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="appendix_5.xml"
+  <xi:include href="appendix_5.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-              xmlns:xi="http://www.w3.org/2001/XInclude" />
+</book>
+\ No newline at end of file
-</book>
diff --git a/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
index 8895c23..80755c2 100644
--- a/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="clav_vnf_example">
  <title>Clavister VNF Example Use-cases</title>
@@ -33,23 +33,33 @@
      <itemizedlist>
        <listitem>
-          <para>Enea Test VNF image. Please contact Enea to get this image.</para>
+          <para>Enea Test VNF image. Please contact Enea to get this
+          image.</para>
        </listitem>
        <listitem>
          <para>Clavister VNF image. Please contact Clavister to get this
          image.</para>
        </listitem>
-        
-        <listitem><para>VNF Configuration files. These files are provided with your Enea
+        <listitem>
-        Edge release:</para>
+          <para>VNF Configuration files. These files are provided with your
-        
+          Enea Edge release:</para>
-        <itemizedlist spacing="compact">
-          <listitem><para><filename>clavister-cloudinit.conf</filename>.</para></listitem>
+          <itemizedlist spacing="compact">
-          <listitem><para><filename>enea-vnf-iperf-client.conf</filename>.</para></listitem>
+            <listitem>
-          <listitem><para><filename>enea-vnf-iperf-server.conf</filename>.</para></listitem>
+              <para><filename>clavister-cloudinit.conf</filename>.</para>
+            </listitem>
+            <listitem>
+              <para><filename>enea-vnf-iperf-client.conf</filename>.</para>
+            </listitem>
+            <listitem>
+              <para><filename>enea-vnf-iperf-server.conf</filename>.</para>
+            </listitem>
          </itemizedlist>
-          </listitem>
+        </listitem>
      </itemizedlist>
    </section>
@@ -62,22 +72,22 @@
      bridges.</para>
      <figure>
-          <title>Clavister VNF using an Open vSwitch bridge</title>
+        <title>Clavister VNF using an Open vSwitch bridge</title>
-          <mediaobject>
+        <mediaobject>
-            <imageobject>
+          <imageobject>
-              <imagedata align="center" contentwidth="600"
+            <imagedata align="center" contentwidth="600"
-                         fileref="images/uc_clavister_bridge.png" />
+                       fileref="images/uc_clavister_bridge.png" />
-            </imageobject>
+          </imageobject>
-          </mediaobject>
+        </mediaobject>
-        </figure>
+      </figure>
-        
-       <note>
+      <note>
-         <para>When connecting, the uCPE devices can use a back-to-back or a VPN connection. 
+        <para>When connecting, the uCPE devices can use a back-to-back or a
-           An appropriate interface with the required capabilities needs to be chosen for 
+        VPN connection. An appropriate interface with the required
-           this purpose.</para>
+        capabilities needs to be chosen for this purpose.</para>
-          </note>
+      </note>
-      
      <para><emphasis role="bold">Network Configuration:</emphasis></para>
      <orderedlist>
@@ -324,21 +334,32 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
      <itemizedlist>
        <listitem>
-          <para>Enea Test VNF image. Please contact Enea to get this image.</para>
+          <para>Enea Test VNF image. Please contact Enea to get this
+          image.</para>
        </listitem>
        <listitem>
          <para>Clavister VNF image. Please contact Clavister to get this
          image.</para>
        </listitem>
-        
-        <listitem><para>VNF Configuration files. These files are provided with your Enea
+        <listitem>
-        Edge release:</para>
+          <para>VNF Configuration files. These files are provided with your
+          Enea Edge release:</para>
          <itemizedlist spacing="compact">
-            <listitem><para><filename>clavister-cloudinit.conf</filename>.</para></listitem>
+            <listitem>
-            <listitem><para><filename>enea-vnf-iperf-client.conf</filename>.</para></listitem>
+              <para><filename>clavister-cloudinit.conf</filename>.</para>
-            <listitem><para><filename>enea-vnf-iperf-server.conf</filename>.</para></listitem>
+            </listitem>
-          </itemizedlist>  
+            <listitem>
+              <para><filename>enea-vnf-iperf-client.conf</filename>.</para>
+            </listitem>
+            <listitem>
+              <para><filename>enea-vnf-iperf-server.conf</filename>.</para>
+            </listitem>
+          </itemizedlist>
        </listitem>
      </itemizedlist>
    </section>
@@ -367,8 +388,9 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
        <listitem>
          <para>Select uCPE device 1, access <literal>Configuration</literal>,
          add the network interface that will be used and configure it for
-          SR-IOV. For <literal>sriov-mode</literal> select <literal>adapter-pool</literal> and for 
+          SR-IOV. For <literal>sriov-mode</literal> select
-            <literal>sriov-num-vfs</literal> select "2".</para>
+          <literal>adapter-pool</literal> and for
+          <literal>sriov-num-vfs</literal> select "2".</para>
        </listitem>
        <listitem>
diff --git a/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
index bee5a63..0c3815e 100644
--- a/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter condition="hidden" id="enea_vnf_examples">
  <title>Enea Test VNF Example Use-cases</title>
@@ -17,8 +17,8 @@
    <itemizedlist>
      <listitem>
-        <para>2 Network Interfaces. One for Enea Edge Management and one for data
+        <para>2 Network Interfaces. One for the Enea Edge Management
-        traffic.</para>
+        application and one for data traffic.</para>
      </listitem>
      <listitem>
@@ -168,8 +168,8 @@
        </listitem>
        <listitem>
-          <para>Instantiate the Enea Edge TestPMD termination VNF on
+          <para>Instantiate the Enea Edge TestPMD termination VNF on uCPE
-          uCPE Device 2 by filling the required fields with the following
+          Device 2 by filling the required fields with the following
          values:</para>
          <itemizedlist spacing="compact">
@@ -218,7 +218,7 @@
          <literal>testpmd_term</literal>.</para>
          <note>
-            <para>The flow rules can be described using either the Enea Edge 
+            <para>The flow rules can be described using either the Enea Edge
            Management interface or the configuration files.</para>
          </note>
        </listitem>
diff --git a/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
index 1e81ca4..cc3be97 100644
--- a/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_fortigate">
  <title>FortiGate VNF Example Use-cases</title>
@@ -254,8 +254,8 @@
      targetptr="fortigate_webmg">FortiGate VNF web management in the
      <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xpointer="element(book_enea_edge_example_usecases/1)" /></olink>
+      xpointer="element(book_enea_edge_example_usecases/1)" /></olink> Manual
-      Manual for more information.</para>
+      for more information.</para>
    </section>
  </section>
diff --git a/doc/book-enea-edge-example-usecases/doc/introduction.xml b/doc/book-enea-edge-example-usecases/doc/introduction.xml
index ca0b310..27824da 100644
--- a/doc/book-enea-edge-example-usecases/doc/introduction.xml
+++ b/doc/book-enea-edge-example-usecases/doc/introduction.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="intro">
  <title>Introduction</title>
@@ -6,19 +6,19 @@
  configuration, onboarding and instantiation of certain VNFs, VNF chaining,
  etc.</para>
-  <para>Before running any example use case make sure the uCPE device(s) have
+  <para>Before running any example use-case make sure the uCPE device(s) have
-  been added to Enea Edge Management and placed on the map. For detailed
+  been added to the Enea Edge Management application and placed on the map.
-  information on how to add a device to Enea Edge Management, how to configure the
+  For detailed information on how to add a device to the Enea Edge Management
-  network interfaces to use DPDK, PCI-passthrough or SR-IOV drivers, or VNF
+  application, how to configure the network interfaces to use DPDK,
-  configuration, please refer to the <xi:include
+  PCI-passthrough or SR-IOV drivers, or VNF configuration, please refer to the
-  href="../../s_docbuild/olinkdb/pardoc-common.xml"
+  <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(book_enea_edge_getting_started/1)" /> Manual.</para>
  <note>
    <para>Examples presented in this document use 3rd-party VNFs, which are
    not provided by Enea. To procure and use these VNF image files and license
-    files, please contact the VNF provider. </para>
+    files, please contact the VNF provider.</para>
    <para>Request the VNF prerequisites from the VNF vendors, or alternatively
    obtain the prerequisites based on instructions from each VNF vendor
diff --git a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
index bb05905..4529fbf 100644
--- a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="service_chaining_128t_fortigate">
  <title>Service Chaining 128T - Fortigate Example Use-case</title>
  <para>The following is an example of how to setup and configure a service
-  chain on top of the Enea Edge Runtime, using the
+  chain on top of the Enea Edge Runtime, using the following commercial VNFs:
-  following commercial VNFs: 128T router and FortiGate.</para>
+  128T router and FortiGate.</para>
  <section id="prereq_serv_chain_cust">
    <title>Prerequisites</title>
@@ -86,9 +86,9 @@
      <para><emphasis role="bold">Configuring Network Interfaces on uCPE
      devices:</emphasis><orderedlist>
          <listitem>
-            <para>Add the trgt uCPE device into Enea Edge Management:
+            <para>Add the trgt uCPE device into the Enea Edge Management
-            <literal>Devices -&gt; Manage -&gt; Add</literal>, and fill in the
+            application: <literal>Devices -&gt; Manage -&gt; Add</literal>,
-            required fields with the following data:</para>
+            and fill in the required fields with the following data:</para>
            <table>
              <title>Device Details</title>
diff --git a/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
index 24442af..affbf39 100644
--- a/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_chaining">
  <title>VNF Chaining Example Use-case</title>
@@ -11,9 +11,8 @@
  <para>The following is an example of how to setup and configure a
  branch-to-branch service comprised on two commercial VNFs (SD-WAN +
-  Firewall). This service will run in a service chain on top of the Enea
+  Firewall). This service will run in a service chain on top of the Enea Edge
-  Edge Runtime, deployed through the Enea Edge
+  Runtime, deployed through the Enea Edge Management.</para>
-  Management.</para>
  <para>In the example setup the following commercial VNFs are used: Juniper
  vSRX as the SD-WAN VNF and Fortigate as the Router/Firewall.</para>
diff --git a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
index e321cf9..90de441 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="advanced_conf">
@@ -23,14 +23,14 @@
    proceeds to install the system by dividing the disk into 2 partitions: a
    GPT partition containing the GRUB boot loader and a second partition
    containing the Enea Edge Runtime root filesystem. When the installation is
-    complete, the uCPE device is automatically rebooted into Enea Edge
+    complete, the uCPE device is automatically rebooted into the Enea Edge
    Runtime.</para>
    <note>
      <para>The <literal>.hddimg</literal>, <literal>initramfs</literal>, and
      <literal>bzImage</literal> files are available in the
      <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz</filename>
-      file you downloaded with your release.</para>
+      file downloaded with your release.</para>
    </note>
    <section id="bare_meta_prov_prereq">
@@ -102,32 +102,26 @@
        <para>An installation configuration file needs to be prepared on the
        HTTP server. The format of the configuration file is a list of
        "<literal>name = value</literal>" pairs and the available parameters
-        are described below.</para>
+        are described below:</para>
-        <para>Mandatory parameter(s):</para>
        <itemizedlist>
          <listitem>
-            <para><literal>image_url</literal>. The HTTP server URL used for
+            <para><literal>image_url</literal> (mandatory). The HTTP server
-            downloading the Enea Edge Runtime image.</para>
+            URL used for downloading the Enea Edge Runtime image.</para>
          </listitem>
-        </itemizedlist>
-        <para>Optional parameters:</para>
-        <itemizedlist>
          <listitem>
-            <para><literal>install_drive</literal>. The name of the drive
+            <para><literal>install_drive</literal> (optional). The name of the
-            where the Enea Edge Runtime will be installed (e.g
+            drive where the Enea Edge Runtime will be installed (e.g
            <literal>/dev/sda</literal>). If not set, the installer will use
            the largest detected (non-USB) drive on the uCPE device.</para>
          </listitem>
          <listitem>
-            <para><literal>prompt_user</literal>. If the parameter is set to
+            <para><literal>prompt_user</literal> (optional). If the parameter
-            "yes", the installer will ask for confirmation before formatting
+            is set to "yes", the installer will ask for confirmation before
-            and partitioning the drive. The default behaviour is to proceed
+            formatting and partitioning the drive. The default behaviour is to
-            automatically without any user interaction.</para>
+            proceed automatically without any user interaction.</para>
          </listitem>
        </itemizedlist>
@@ -175,7 +169,7 @@ ipappend 2</programlisting>
 ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; power reset   </programlisting>
      <para>The uCPE devices should be configured in BIOS to boot from the
-      installation drive first in order to automatically start the Enea Edge
+      installation drive first in order to automatically start Enea Edge
      Runtime when the installation is finished.</para>
    </section>
  </section>
@@ -418,12 +412,13 @@ node0.1048576kB = 3 </programlisting>
  </section>
  <section condition="hidden" id="high_availability_ig">
-    <title>Installing the Enea Edge Management in High Availability
+    <title>Installing the Enea Edge Management application in High
-    Mode</title>
+    Availability Mode</title>
    <para>The following describes the setup needed for running the Enea Edge
-    Management in High Availabilty (HA) mode, with a MariaDB database cluster.
+    Management application in High Availabilty (HA) mode, with a MariaDB
-    A setup example is illustrated in the diagram below.</para>
+    database cluster. A setup example is illustrated in the diagram
+    below.</para>
    <figure>
      <title>The High Availability setup</title>
@@ -441,24 +436,51 @@ node0.1048576kB = 3 </programlisting>
    example, two of the machines are running only MariaDB, while the rest are
    hosting a MariaDB server and an Enea Edge Management instance. The entire
    network is hidden behind a firewall that performs NAT. While in protection
-    (cluster) mode, the Enea Edge Management instances promote a single
+    (cluster) mode, the Enea Edge Management application instances promote a
-    Virtual IP (VIP). The cluster can be reached either from the primary
+    single Virtual IP (VIP). The cluster can be reached either from the
-    server IP or via VIP (recommended), since the VIP interface is spawned on
+    primary server IP or via VIP (recommended), since the VIP interface is
-    the primary server. In case of a primary failure, the newly elected
+    spawned on the primary server. In case of a primary failure, a newly
-    primary (from one of the backups) will respawn the VIP interface. The
+    elected primary (from one of the backups) will respawn the VIP interface.
-    firewall in this scenario will allocate a public IP for the outside world
+    The firewall in this scenario will allocate a public IP for the outside
-    that will be translated into the VIP. Also in this example, the traffic
+    world that will be translated into the VIP. Also in this example, the
-    towards the cluster from outside the firewall is done through HTTPS, which
+    traffic towards the cluster from outside the firewall is done through
-    will be translated to HTTP inside the private network.</para>
+    HTTPS, which will be translated to HTTP inside the private network.</para>
    <note>
-      <para>By default, communication to the Enea Edge Management is done with
+      <para>By default, communication to the Enea Edge Management application
-      HTTPS. To enable HTTP, go to <emphasis role="bold">System</emphasis>,
+      is done with HTTPS. To enable HTTP, go to <emphasis
-      <emphasis role="bold">Configuration</emphasis>, click on the <emphasis
+      role="bold">System</emphasis>, <emphasis
+      role="bold">Configuration</emphasis>, click on the <emphasis
      role="bold">Web Access</emphasis> tab and check the <emphasis
      role="bold">Enable HTTP</emphasis> checkbox.</para>
    </note>
+    <para><emphasis role="bold">High-Availability - Design
+    Limitations</emphasis></para>
+    <para>Enea's solution for Edge Management High-Availability is designed to
+    maximize resiliency of the management function. However, the current design 
+      does not provide guaranteed consistency across all Enea Edge
+    Management instances, i.e. some information might become out-of-sync in
+    certain conditions.</para>
+    <para>In order to reach full consistency, design would rely on
+    transactional data updates across the Primary instance and all Backups,
+    but the latency would significantly increase for all management
+    operations, which is considered to be a severe limitation.</para>
+    <para>In the current version of the Enea Edge Management application when
+    in High Availability mode, there are two kinds of data that needs to be
+    synchronized: data in the database and data residing in the Primary
+    instance filesystem. This means that there are intervals when data is
+    being synchronized from the Primary instance to the Backup(s) and Primary
+    failure at this time will result in incomplete/inconsistent data on the
+    Backup(s). For example, a VNF which has been onboarded on the Primary
+    instance will not be visible in a Backup instance(s) until both database
+    and filesystem have been synchronized. If a Backup instance becomes the
+    active one before synchronization takes place, this would result in an
+    out-of-sync state.</para>
+    
    <section id="ha_reqs">
      <title>Requirements for High Availability</title>
@@ -467,7 +489,8 @@ node0.1048576kB = 3 </programlisting>
      <itemizedlist>
        <listitem>
-          <para>Machines running the Enea Edge Management and MariaDB:</para>
+          <para>Machines running the Enea Edge Management application and
+          MariaDB:</para>
          <itemizedlist spacing="compact">
            <listitem>
@@ -507,13 +530,12 @@ node0.1048576kB = 3 </programlisting>
    <section id="firewall_rules">
      <title>Firewall Rules</title>
-      <para>Please refer to <olink
+      <para>Please refer to <olink targetdoc="book_enea_edge_getting_started"
-      targetdoc="book_enea_nfv_access_getting_started"
      targetptr="firewall_config">Firewall Configuration 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.
-      Manual. In addition, the following configuration is needed:</para>
+      In addition, the following configuration is needed:</para>
      <orderedlist>
        <listitem>
@@ -590,7 +612,8 @@ SELINUXTYPE=targeted</programlisting>
      </table>
      <para>For MariaDB, the following ports must be opened (on each MariaDB
-      server, including the ones hosting the Enea Edge Management):</para>
+      server, including the ones hosting the Enea Edge Management
+      application):</para>
      <table>
        <title>Ports for MariaDB Machines</title>
@@ -685,9 +708,10 @@ SELINUXTYPE=targeted</programlisting>
    <section id="ha_installation">
      <title>Installing High Availability</title>
-      <para>The Enea Edge Management can be installed in High Availability
+      <para>The Enea Edge Management application can be installed in High
-      mode with a MariaDB database cluster by performing the following steps.
+      Availability mode with a MariaDB database cluster by performing the
-      The mandatory Java configuration is also detailed.</para>
+      following steps. The mandatory Java configuration is also
+      detailed.</para>
      <section id="ha_mariadb">
        <title>Installing and configuring the MariaDB cluster</title>
@@ -706,14 +730,16 @@ SELINUXTYPE=targeted</programlisting>
            <para>Install the MariaDB official yum repository. Create a file
            named <literal>mariadb.repo</literal> in
            <literal>/etc/yum.repos.d/</literal> with the following
-            content:<programlisting># MariaDB 10.5 CentOS repository list - created 2021-02-16 08:46 UTC
+            content:</para>
+            <programlisting># MariaDB 10.5 CentOS repository list - created 2021-02-16 08:46 UTC
 # http://downloads.mariadb.org/mariadb/repositories/
 [mariadb]
 name = MariaDB
 baseurl = http://yum.mariadb.org/10.5/centos7-amd64
 gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
 gpgcheck=1
-</programlisting></para>
+</programlisting>
            <note>
              <para>For more information about setting the repository, consult
@@ -825,20 +851,20 @@ Switch to unix_socket authentication [Y/n] <emphasis role="bold">Y</emphasis>
 Enabled successfully!
 Reloading privilege tables..
 ... Success!
-&hellip;
+…
 Change the root password? [Y/n] <emphasis role="bold">Y</emphasis>
 New password: 
 Re-enter new password: 
 Password updated successfully!
 Reloading privilege tables..
 ... Success!
-&hellip;
+…
 Remove anonymous users? [Y/n] <emphasis role="bold">Y</emphasis>
 ... Success!
-&hellip;
+…
 Disallow root login remotely? [Y/n] <emphasis role="bold">Y</emphasis>
 ... Success!
-&hellip;
+…
 Remove test database and access to it? [Y/n] <emphasis role="bold">Y (optional)</emphasis>
 - Dropping test database...
 ... Success!
@@ -873,12 +899,12 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
        <title>Installing the Java SDK</title>
        <para>Please refer to <olink
-        targetdoc="book_enea_nfv_access_getting_started"
+        targetdoc="book_enea_edge_getting_started"
        targetptr="openjdk_postgresql_config">Configuring OpenJDK and
        PostgreSQL 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, for details on how to install and configure Java
        OpenJDK.</para>
@@ -891,40 +917,40 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
      </section>
      <section id="ha_ucpe_mg">
-        <title>Installing the Enea Edge Management in High Availabilty
+        <title>Installing the Enea Edge Management application in High
-        mode</title>
+        Availabilty mode</title>
        <para>These steps must be taken on each of the CentOS 7 machines that
-        will host the Enea Edge Management. The Enea Edge Management will be
+        will host the Enea Edge Management application. It will be installed
-        installed and the setup for the external database cluster will be
+        and the setup for the external database cluster will be
        prepared.</para>
        <para>As the root user, go to the distribution folder of the Enea Edge
-        Management, and run:</para>
+        Management application, and run:</para>
        <programlisting>[root@localhost distro]#./install.sh /opt/ \
 Enea_NFV_Access_uCPEManager_2.3.0-build23.tar.gz
-This will install uCPEManager into /opt/ucpemanager folder.
+This will install the Enea Edge Management application into the /opt/ucpemanager folder.
 Select the following options, while asked by the installation script:
 Are you using the embedded PostgreSQL database? [Y/N]: <emphasis role="bold">N</emphasis>
 External database selected, getting user information ...
 Press 1 for PostgreSQL, 2 for MariaDB, 3 for SQL Server, 4 for Oracle and 5 \
 for MySQL: <emphasis role="bold">2</emphasis>
 Specify database server name(s) or IP Address(es): \
-<emphasis role="bold">192.168.10.11,192.168.10.12,&hellip;,192.168.10.16 *(see note)</emphasis>
+<emphasis role="bold">192.168.10.11,192.168.10.12,…,192.168.10.16 *(see note)</emphasis>
 Specify database ID (or name) [ucpemanager]: 
 Specify database server port [3306]: 
 Specify database user name [root]: enea
 Specify database password [root]: somepassword
 Specify database startup thread pool size [1]: 
 Creating database configuration file \
-/opt//ucpemanager/application/config/databaseConfig.xml ...
+/opt/ucpemanager/application/config/databaseConfig.xml ...
 Done .
-&hellip;
+…
 Installing ucpemanager service ..
 Specify service username [ucpemanager]: 
 Specify service password [ucpemanager]: somepassword
-&hellip;
+…
 Specify the IP address of the local interface: <emphasis role="bold">192.168.10.11</emphasis>
 Is this server part of a cluster? [Y/N]: <emphasis role="bold">Y</emphasis>
 Specify the name of the cluster [ucpemanager]: 
@@ -938,9 +964,9 @@ Configuration complete.</programlisting>
        <note>
          <para>For each Enea Edge Management installation, place the local
          interface IP first in the list of IPs. This will optimize database
-          communication, since the Enea Edge Management uses the list of IPs
+          communication, since the Enea Edge Management application uses the
-          sequentially, therefore using the internal loopback interface for
+          list of IPs sequentially, therefore using the internal loopback
-          communicating with the database.</para>
+          interface for communicating with the database.</para>
        </note>
        <para>The arbiter IP and port are used to mitigate split brain
@@ -956,6 +982,24 @@ Configuration complete.</programlisting>
        role="bold">System</emphasis> and select <emphasis role="bold">Cluster
        View</emphasis>. The list of Enea Edge Management servers should be
        displayed, with one listed as Primary and the rest as Backup.</para>
+        
+        <note><para>To avoid split-brain (network-partitioning) scenarios, it is possible 
+          for the user to specify an IP:port tuple for a system that acts as an 
+          Arbiter. In case both Primary and Backup servers cannot reach the Arbiter, 
+          there will be no Primary system to connect to and the management services 
+          will be unavailable.</para>
+        
+        <para>This can be manually remedied by either fixing the network situation 
+          that caused the partitioning or modifying Arbiter information in the 
+          configuration file on the server that the user decides should be the 
+          (one and only) Primary server.</para></note>
+        <para><remark>ELCCR-907</remark>At times the VIP address is not
+        acquired by any of the backup nodes if a power failure happens on
+        primary node in a High Availability setup. To recover, follow the
+        official documentation available at <ulink
+        url="https://mariadb.com/kb/en/galera-cluster-recovery/">Galera
+        Cluster Recovery</ulink>.</para>
        <para>To change the configuration at a later point after the
        installation, either uninstall and then reinstall the product, or
@@ -972,8 +1016,9 @@ Configuration complete.</programlisting>
      <orderedlist>
        <listitem>
-          <para>We start with the assumption that <literal>ucpeManager-1
+          <para>We start with the assumption that
-          </literal>is the "PRIMARY" server.</para>
+          <literal>EneaEdgeManagement-1 </literal>is the "PRIMARY"
+          server.</para>
        </listitem>
        <listitem>
@@ -988,34 +1033,35 @@ Configuration complete.</programlisting>
        </listitem>
        <listitem>
-          <para>Run the upgrade process on <literal>ucpeManager-3</literal>
+          <para>Run the upgrade process on
-          and <literal>ucpeManager-4</literal>. This will upgrade the service
+          <literal>EneaEdgeManagement-3</literal> and
-          to the current release. Once the upgrade process completes, shutdown
+          <literal>EneaEdgeManagement-4</literal>. This will upgrade the
-          the Enea Edge Management service on both machines.</para>
+          service to the current release. Once the upgrade process completes,
+          shutdown the Enea Edge Management service on both machines.</para>
        </listitem>
        <listitem>
-          <para>Disconnect the <literal>ucpeManager-2</literal> machine from
+          <para>Disconnect the <literal>EneaEdgeManagement-2</literal> machine
-          the network (which will take MariaDB-2 offline as well). At this
+          from the network (which will take MariaDB-2 offline as well). At
-          point, only the "PRIMARY" server is running, this is the start of
+          this point, only the "PRIMARY" server is running, this is the start
-          the interval when we are susceptible to single-server
+          of the interval when we are susceptible to single-server
          failure.</para>
        </listitem>
        <listitem>
          <para>Shutdown the MariaDB-2 process and run the Enea Edge
-          Management upgrade process on <literal>ucpeManager-2</literal>. This
+          Management upgrade process on
-          will upgrade the service to the current release. Once the upgrade
+          <literal>EneaEdgeManagement-2</literal>. This will upgrade the
-          process completes, shutdown the Enea Edge Management service on the
+          service to the current release. Once the upgrade process completes,
-          machine.</para>
+          shutdown the Enea Edge Management service on the machine.</para>
        </listitem>
        <listitem>
          <para>Reconnect the network interfaces towards the VPN for MariaDB-4
-          (<literal>ucpeManager-3</literal>), MariaDB-5
+          (<literal>EneaEdgeManagement-3</literal>), MariaDB-5
-          (<literal>ucpeManager-4</literal>) and MariaDB-6
+          (<literal>EneaEdgeManagement-4</literal>) and MariaDB-6
-          (<literal>ucpeManager-2</literal>). Restart database services on
+          (<literal>EneaEdgeManagement-2</literal>). Restart database services
-          MariaDB-2, MariaDB-4, MariaDB-5 and MariaDB-6. This will allow
+          on MariaDB-2, MariaDB-4, MariaDB-5 and MariaDB-6. This will allow
          database services on all machines to synchronize, any data that has
          been modified during the upgrade process will be made
          consistent.</para>
@@ -1023,35 +1069,36 @@ Configuration complete.</programlisting>
        <listitem>
          <para>Shutdown the "Primary" server
-          (<literal>ucpeManager-1</literal>). At this point, the service is no
+          (<literal>EneaEdgeManagement-1</literal>). At this point, the
-          longer available.</para>
+          service is no longer available.</para>
        </listitem>
        <listitem>
-          <para>Start the Enea Edge Management services on
+          <para>Start the Enea Edge Management service on
-          <literal>ucpeManager-2</literal>. This machine will come up as the
+          <literal>EneaEdgeManagement-2</literal>. This machine will come up
-          new "PRIMARY" with the upgraded software. As part of the startup
+          as the new "PRIMARY" with the upgraded software. As part of the
-          process, it will upgrade the database and perform any other
+          startup process, it will upgrade the database and perform any other
          upgrade-related functionality.</para>
        </listitem>
        <listitem>
          <para>At this point (once startup completes), service is available.
-          However, we are still susceptible to single-server failure.</para>
+          However, the system is still susceptible to single-server
+          failure.</para>
        </listitem>
        <listitem>
          <para>Start the Enea Edge Management services on
-          <literal>ucpeManager-3</literal> and
+          <literal>EneaEdgeManagement-3</literal> and
-          <literal>ucpeManager-4</literal>. At this point, we are in
+          <literal>EneaEdgeManagement-4</literal>. At this point, they will
-          highly-available mode.</para>
+          operate in highly-available mode.</para>
        </listitem>
        <listitem>
-          <para>Upgrade the Enea Edge Management on
+          <para>Upgrade the Enea Edge Management application on
-          <literal>ucpeManager-1</literal> (the one that has been shut down).
+          <literal>EneaEdgeManagement-1</literal> (the one that has been shut
-          Once that upgrade is complete and the service restarts, the entire
+          down). Once that upgrade is complete and the service restarts, the
-          setup has been upgraded to the new version.</para>
+          entire setup has been upgraded to the new version.</para>
        </listitem>
      </orderedlist>
    </section>
diff --git a/doc/book-enea-edge-getting-started/doc/book.xml b/doc/book-enea-edge-getting-started/doc/book.xml
index f02f770..07021cb 100644
--- a/doc/book-enea-edge-getting-started/doc/book.xml
+++ b/doc/book-enea-edge-getting-started/doc/book.xml
@@ -1,14 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
 <book id="book_enea_edge_getting_started">
-  <title><trademark class="registered">Enea</trademark> Edge Getting Started</title>
+  <title><trademark class="registered">Enea</trademark> Edge Getting
+  Started</title>
-  <subtitle>Release Version
+  <subtitle>Release Version <xi:include
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
@@ -17,28 +19,26 @@
  <xi:include href="introduction.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                          
  <xi:include href="installation_guide.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="upgrade_ena.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                                
  <xi:include href="advanced_configurations.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                                
  <xi:include href="net_config_options.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
-                                
-  <xi:include href="vnf_mg.xml"
+  <xi:include href="vnf_mg.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="log_collector.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
-  <xi:include href="grafana.xml"
+  <xi:include href="grafana.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
  <xi:include href="troubleshooting.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude" />
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
+</book>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/grafana.xml b/doc/book-enea-edge-getting-started/doc/grafana.xml
index 5dfaa98..807c2ac 100644
--- a/doc/book-enea-edge-getting-started/doc/grafana.xml
+++ b/doc/book-enea-edge-getting-started/doc/grafana.xml
@@ -1,21 +1,25 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="grafana">
  <title>Using Grafana and InfluxDB</title>
-  <para>InfluxDB is essentially a time series database process that runs on a
+  <para><ulink url="https://docs.influxdata.com/influxdb/">InfluxDB</ulink> is 
-  server, while Grafana is a visualization tool for time series data. Grafana
+    essentially a time series database process that runs on a server, while 
-  is a very lightweight server-side application, and most of the monitoring
+    <ulink url="https://grafana.com/docs/grafana">Grafana</ulink> is a 
-  runs in a browser.</para>
+    visualization tool for time series data. Grafana is a very lightweight 
+    server-side application, and most of the data monitoring runs in a browser.</para>
+  
+  <para>For details on version information for these two components, please refer to the 
+  <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>
  <section id="telemetry_deployment">
    <title>Deploying Grafana and InfluxDB</title>
    <para>Grafana and InfluxDB can be deployed using images for Docker on
    linux. These images are provided by Enea along with a deploy script and
-    predefined dashboards.</para>
+    predefined dashboards. The Grafana and InfluxDB images can be deployed on
+    the same machine or on separate machines.</para>
-    <para>The Grafana and InfluxDB images can be deployed on the same machine
-    or on separate machines.</para>
    <section id="prereq_deploy">
      <title>Prerequisites for Deploying an Image</title>
@@ -28,55 +32,59 @@
        </listitem>
        <listitem>
-            <para>Internet connection for installing the Docker tool.</para>
+          <para>Internet connection for installing the Docker tool.</para>
        </listitem>
        <listitem>
-            <para>Root rights on the CentOS 7 machine.</para>
+          <para>Root rights on the CentOS 7 machine.</para>
        </listitem>
      </itemizedlist>
    </section>
    <section id="docker_steps">
-        <title>Setting up Docker for Grafana and InfluxDB</title>
+      <title>Setting up Docker for Grafana and InfluxDB</title>
-      
-        <para>In order to use the Grafana and InfluxDB containers, the Docker 
+      <para>In order to use the Grafana and InfluxDB containers, the Docker
-          tool that runs and manages containers needs to be available on 
+      tool that runs and manages containers needs to be available on the
-          the server.</para>
+      server.</para>
-      
-        <para>To install Docker on a CentOS 7 server open a terminal, log 
+      <para>To install Docker on a CentOS 7 server open a terminal, log into a
-          into a bash shell with the root account and run the following commands:</para>
+      bash shell with the root account and run the following commands:</para>
      <orderedlist>
-         <listitem>
-           <para><literal>yum check-update</literal></para>
-         </listitem>
-        
        <listitem>
-          <para><literal>yum install -y yum-utils device-mapper-persistent-data lvm2</literal></para>
+          <para><literal>yum check-update</literal></para>
-         </listitem>
+        </listitem>
-        
-         <listitem>
-           <para><literal>yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo</literal></para>
-         </listitem>
-        
-         <listitem>
-           <para><literal>yum install docker</literal></para>
-         </listitem>
-        </orderedlist>
-        
-        <para>In order to deploy the Grafana and InfluxDB images, the Docker 
-          service needs to be started. To start the Docker service, log into 
-          a bash shell with the root account and run the following command: 
-          <literal>systemctl start docker</literal>.</para>
-        
-        <note><para>By default, the Docker service is not configured to start at boot. 
-          In order to configure it to autostart, log into a bash shell
-        with the root account and run the following command: 
-          <literal>systemctl enable docker</literal>. The Grafana and InfluxDB 
-          images are configured to autostart when the Docker service starts.</para></note>
-    </section>
+        <listitem>
+          <para><literal>yum install -y yum-utils
+          device-mapper-persistent-data lvm2</literal></para>
+        </listitem>
+        <listitem>
+          <para><literal>yum-config-manager --add-repo
+          https://download.docker.com/linux/centos/docker-ce.repo</literal></para>
+        </listitem>
+        <listitem>
+          <para><literal>yum install docker</literal></para>
+        </listitem>
+      </orderedlist>
+      <para>In order to deploy the Grafana and InfluxDB images, the Docker
+      service needs to be started. To start the Docker service, log into a
+      bash shell with the root account and run the following command:
+      <literal>systemctl start docker</literal>.</para>
+      <note>
+        <para>By default, the Docker service is not configured to start at
+        boot. In order to configure it to autostart, log into a bash shell
+        with the root account and run the following command:
+        <literal>systemctl enable docker</literal>. The Grafana and InfluxDB
+        images are configured to autostart when the Docker service
+        starts.</para>
+      </note>
+    </section>
    <section id="deploy_steps">
      <title>Deploying Grafana and InfluxDB</title>
@@ -90,11 +98,13 @@
          <filename>Enea_Edge_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>.</para>
          <para>The directory in which the archive will be unpacked will be
-          denoted as: <literal>&lt;Telemetry-installdir&gt;</literal>.</para>
+          denoted as:
+          <literal>&lt;Telemetry-installerdir&gt;</literal>.</para>
        </listitem>
        <listitem>
-          <para>Enter <literal>&lt;Telemetry-installdir&gt;</literal>.</para>
+          <para>Enter
+          <literal>&lt;Telemetry-installerdir&gt;</literal>.</para>
        </listitem>
        <listitem>
@@ -103,25 +113,26 @@
        </listitem>
        <listitem>
-            <para>When prompted, select what images you want to deploy. 
+          <para>When prompted, select what images you want to deploy. Select
-              Select <literal>Both</literal> unless you wish for the Grafana 
+          <literal>Both</literal> unless you wish for the Grafana and InfluxDB
-              and InfluxDB images to be on separate servers.</para>
+          images to be on separate servers.</para>
-          
-            <note>
+          <note>
-              <para>If an image is already deployed, you will be prompted 
+            <para>If an image is already deployed, you will be prompted to
-                to replace it.</para>
+            replace it.</para>
-              
-              <para>By default, Grafana is configured for deployment on the 
+            <para>By default, Grafana is configured for deployment on the same
-                same server as InfluxDB. Please read the Grafana documentation 
+            server as InfluxDB. Please read the Grafana documentation on how
-                on how to configure it if you wish to deploy the images 
+            to configure it if you wish to deploy the images on separate
-                on separate servers.</para>
+            servers.</para>
-            </note>
+          </note>
        </listitem>
        <listitem>
          <para>During the InfluxDB deployment, you will be prompted to
          provide a username and password. These must match the ones
-          configured in the Enea Edge Management for Telemetry.</para>
+          configured in the Enea Edge Management application for
+          Telemetry.</para>
          <note>
            <para>Changing the InfluxDB username and password requires
@@ -135,47 +146,48 @@
          present and have the status <literal>Up</literal>.</para>
        </listitem>
      </orderedlist>
-        
-        <note>
+      <note>
-           <para>The provided Grafana instance by default uses the 
+        <para>The provided Grafana instance by default uses the
-             <literal>Username:</literal> <emphasis role="bold">admin</emphasis> and 
+        <literal>Username:</literal> <emphasis role="bold">admin</emphasis>
-           <literal>Password:</literal> <emphasis role="bold">admin</emphasis>.</para>
+        and <literal>Password:</literal> <emphasis
-        </note>
+        role="bold">admin</emphasis>.</para>
-      </section>
+      </note>
    </section>
-  
+  </section>
-    <section id="telemetry_firewall_settings">
-        <title>Firewall settings for Grafana and InfluxDB</title>
+  <section id="telemetry_firewall_settings">
-      
+    <title>Firewall settings for Grafana and InfluxDB</title>
-      <para>If a firewall is running on the machines where Grafana and InfluxDB are 
-        deployed, this firewall needs to be configured so the required ports are 
+    <para>If a firewall is running on the machines where Grafana and InfluxDB
-        enabled.</para>
+    are deployed, this firewall needs to be configured so the required ports
-      
+    are enabled.</para>
-      <para>To enable the ports, log into a bash shell with the root account and 
-           perform the following:
+    <para>To enable the ports, log into a bash shell with the root account and
-         </para>
+    perform the following:</para>
-      
-      <orderedlist>
+    <orderedlist>
-        <listitem>
+      <listitem>
-          <para>For InfluxDB, run the following command:</para> 
+        <para>For InfluxDB, run the following command:</para>
-          
-          <programlisting>firewall-cmd --permanent --add-port=25826/tcp</programlisting>
+        <programlisting>firewall-cmd --permanent --add-port=25826/tcp</programlisting>
-        </listitem>
+      </listitem>
-        
-        <listitem>
+      <listitem>
-          <para>For Grafana, run the following command:</para>
+        <para>For Grafana, run the following command:</para>
-          
-          <programlisting>firewall-cmd --permanent --add-port=3000/tcp</programlisting>
+        <programlisting>firewall-cmd --permanent --add-port=3000/tcp</programlisting>
-        </listitem>
+      </listitem>
-      </orderedlist>
+    </orderedlist>
  </section>
  <section id="grafana_settings">
    <title>Setting Grafana and InfluxDB parameters</title>
-    <para>Customizing InfluxDB and Grafana parameters can be done in the Enea uCPE Manager 
+    <para>Customizing InfluxDB and Grafana parameters can be done in the Enea
-      GUI by selecting <emphasis role="bold">System</emphasis>, then the <emphasis
+    Edge Management GUI by selecting the <emphasis
-    role="bold">Configuration</emphasis> menu, accessing the <emphasis
+    role="bold">System</emphasis> menu, then <emphasis
+    role="bold">Configuration</emphasis>, accessing the <emphasis
    role="bold">Properties</emphasis> tab, and clicking on the <emphasis
    role="bold">Telemetry</emphasis> tab. The settings that can be changed are
    listed in the table below:</para>
@@ -202,8 +214,8 @@
          <row>
            <entry>Grafana Hostname or IP Address</entry>
-            <entry>The public hostname or IP address where the Grafana instance is
+            <entry>The public hostname or IP address where the Grafana
-            installed.</entry>
+            instance is installed.</entry>
            <entry>no default</entry>
          </row>
@@ -220,7 +232,7 @@
            <entry>Grafana Dashboard</entry>
            <entry>The dashboard that should be used when opening Grafana
-            using the Enea Edge Management.</entry>
+            using the Enea Edge Management application.</entry>
            <entry>host</entry>
          </row>
@@ -228,8 +240,8 @@
          <row>
            <entry>InfluxDB Hostname or IP Address</entry>
-            <entry>The public hostname or IP address where the InfluxDB database is
+            <entry>The public hostname or IP address where the InfluxDB
-            installed.</entry>
+            database is installed.</entry>
            <entry>no default</entry>
          </row>
@@ -265,8 +277,9 @@
    </table>
    <para>When changing any of the settings in the <emphasis
-    role="bold">Telemetry</emphasis> tab, the Enea Edge Management will inform
+    role="bold">Telemetry</emphasis> tab, the Enea Edge Management application
-    all uCPE devices of the change if they have telemetry running.</para>
+    will inform all uCPE devices of the change if they have telemetry
+    running.</para>
    <figure>
      <title>Telemetry Properties</title>
@@ -289,7 +302,7 @@
    options are available.</para>
    <para>When starting Telemetry for a uCPE device, the Enea Edge Management
-    sends the following information about the InfluxDB:</para>
+    application sends the following information about the InfluxDB:</para>
    <itemizedlist>
      <listitem>
@@ -324,9 +337,10 @@
    </figure>
    <para>When the Telemetry status is changed on a uCPE device, a
-    notification is sent to the Enea Edge Management. These notifications can
+    notification is sent to the Enea Edge Management application. These
-    be inspected under <emphasis role="bold">Fault</emphasis> found in the
+    notifications can be inspected under <emphasis
-    <emphasis role="bold">Event</emphasis> menu.</para>
+    role="bold">Fault</emphasis> found in the <emphasis
+    role="bold">Event</emphasis> menu.</para>
  </section>
  <section id="grafana_launch">
@@ -344,4 +358,4 @@
    <emphasis role="bold">Telemetry</emphasis> tab. The default dashboard
    available when launching Grafana can be customized as well.</para>
  </section>
-</chapter>
+</chapter>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index 2805d4f..1ca3b02 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="installation_guide">
  <title>Setting up and Installing the Enea Edge Base Configuration</title>
@@ -18,11 +18,12 @@
        <note>
          <para>The CentOS 7 server must be updated to the latest revision
-          before installing Enea Edge.</para>
+          before installing Enea Edge, and configured for English language
+          usage.</para>
        </note>
        <para>The following will detail CPU, RAM and storage requirements for
-        the Enea Edge Management Application.</para>
+        the Enea Edge Management application:</para>
        <itemizedlist>
          <listitem>
@@ -81,9 +82,10 @@
        </itemizedlist>
        <para>The purpose of the CentOS 7 server is to host the Enea Edge
-        Management Application. Network access between the CentOS 7 server and the uCPE
+        Management application. Network access between the CentOS 7 server and
-        devices is required. The Enea Edge Management and the uCPE devices
+        the uCPE devices is required. The Enea Edge Management application and
-        will be connected on separate subnets to avoid inconsistencies.</para>
+        the uCPE devices will be connected on separate subnets to avoid
+        inconsistencies.</para>
      </listitem>
      <listitem>
@@ -100,8 +102,7 @@
        supported Intel CPUs of Enea Edge are documented in the <xi:include
        href="../../s_docbuild/olinkdb/pardoc-common.xml"
        xmlns:xi="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_release_info/1)" />
+        xpointer="element(book_enea_edge_release_info/1)" /> Manual.</para>
-        Manual.</para>
        <para>Enea Edge Runtime needs EFI support in BIOS to boot. When
        configuring the uCPE device BIOS a serial connection is
@@ -119,12 +120,12 @@
          </listitem>
          <listitem>
-            <para>Connecting to the GUI of the Enea Edge Management for
+            <para>Connecting to the GUI of the Enea Edge Management
-            management and configuration. Network access between the CentOS 7
+            application for management and configuration. Network access
-            server and the laptop is required. Please see the <xi:include
+            between the CentOS 7 server and the laptop is required. Please see
-            href="../../s_docbuild/olinkdb/pardoc-common.xml"
+            the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
            xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_release_info/1)" /> Manual
+            xpointer="element(book_enea_edge_release_info/1)" /> Manual
            available with your release, for recommended browsers.</para>
          </listitem>
        </itemizedlist>
@@ -147,9 +148,10 @@
      <para>Any firewall running on the CentOS 7 server may block the
      management protocols required to communicate between the uCPE device and
-      the Enea Edge Management as well as between the Enea Edge Management and
+      the Enea Edge Management application as well as between the Enea Edge
-      its northbound clients. Quick handling of a blocking firewall would be
+      Management application and its northbound clients. Quick handling of a
-      to disable it, typical for a lab environment, through:</para>
+      blocking firewall would be to disable it, typical for a lab environment,
+      through:</para>
      <programlisting>sudo systemctl stop firewalld
 sudo systemctl disable firewalld
@@ -186,10 +188,8 @@ sudo systemctl mask now firewalld</programlisting>
              <entry>UDP</entry>
+              <entry>Required for the Enea Edge Management application High
-             <entry condition="hidden">Required for the Enea Edge Management High Availability
+              Availability Configuration.</entry>
-              Configuration.</entry>
            </row>
            <row>
@@ -197,9 +197,8 @@ sudo systemctl mask now firewalld</programlisting>
              <entry>TCP</entry>
-              <entry condition="hidden">Required for the Enea Edge Management High Availability
+              <entry>Required for the Enea Edge Management application High
+              Availability Configuration.</entry>
-              Configuration.</entry>
            </row>
            <row>
@@ -223,7 +222,7 @@ sudo systemctl mask now firewalld</programlisting>
      </table>
      <para>Use the following command sequence to enable the required ports
-      for deployment of the Enea Edge Management:</para>
+      for deployment of the Enea Edge Management application:</para>
      <programlisting>sudo firewall-cmd --permanent --add-port=80/tcp
 sudo firewall-cmd --permanent --add-port=443/tcp
@@ -238,18 +237,19 @@ sudo firewall-cmd --reload</programlisting>
        port-filtering firewall, then all the aforementioned ports need to
        also be enabled on the respective firewall. As an additional
        requirement, port 22/TCP also needs to be enabled for reverse SSH to
-        the Enea Edge Management.</para>
+        the Enea Edge Management application.</para>
        <para>No enabling and no forwarding rules are necessary for ports
-        2021-2040 if using Enea Edge 2.4.0 or newer.</para>
+        2021-2040 if Enea Edge 2.4.0 or newer is used.</para>
      </note>
    </section>
    <section id="openjdk_postgresql_config">
      <title>Configuring OpenJDK and PostgreSQL</title>
-      <para>The Enea Edge Management requires a specific Java version (OpenJDK
+      <para>The Enea Edge Management application requires a specific Java
-      11) and a PostgreSQL version to operate correctly.</para>
+      version (OpenJDK 11) and a PostgreSQL version to operate
+      correctly.</para>
      <para><emphasis role="bold">Installing OpenJDK</emphasis></para>
@@ -299,10 +299,10 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
        </listitem>
      </orderedlist>
-      <para>The Enea Edge Management requires a specific PostgreeSQL version.
+      <para>The Enea Edge Management application requires a specific
-      This is embedded in the Enea Edge Management installation. In order to
+      PostgreSQL version. This is embedded in the Enea Edge Management
-      avoid conflicts, any existing PostgreeSQL installation needs to be
+      installation. In order to avoid conflicts, any existing PostgreSQL
-      uninstalled.</para>
+      installation needs to be uninstalled.</para>
      <para><emphasis role="bold">Uninstalling PostgreSQL</emphasis></para>
@@ -324,8 +324,9 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
          postgres user):</para>
          <note>
-            <para>This step is not necessary if the Enea Edge Management will
+            <para>This step is not necessary if the Enea Edge Management
-            be using an external database (like MariaDB).</para>
+            application will be using an external database (like
+            MariaDB).</para>
          </note>
          <programlisting>yum remove postgres\*
@@ -357,11 +358,13 @@ userdel postgres</programlisting>
        <listitem>
          <para>Follow the installation steps for the Enea Edge Management
-          available in <olink targetdoc="book_enea_nfv_access_getting_started"
+          application available in <olink
-          targetptr="install_ucpe_mg">Installing the Enea Edge Management in
+          targetdoc="book_enea_edge_getting_started"
-          the <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          targetptr="install_ucpe_mg">Installing the Enea Edge Management
+          application 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.</para>
        </listitem>
      </orderedlist>
@@ -388,16 +391,14 @@ userdel postgres</programlisting>
      <title>Determining the Device ID</title>
      <para>Each uCPE device needs a unique identifier. This identifier is
-      used to match the registration in the Enea Edge Management and the
+      used to match the registration in the Enea Edge Management application
-      offline configuration of the uCPE device during ZTP (Zero Touch
+      and the offline configuration of the uCPE device during ZTP (Zero Touch
      Provisioning).</para>
      <para>Select a text string to represent the uCPE device, e.g.
      <literal>uCPE-1</literal> or <literal>fwa-t1012vc_boston_1234</literal>.
      It can have any length and any type of characters with the exception of
-      quotation characters (' or ") or line terminators (\n or \r) which can
+      quotation characters (' or ") or line terminators (\n or \r).</para>
-      interfere with the JSON format of the
-      <filename>install_data.json</filename> file.</para>
    </section>
    <section id="bios_config">
@@ -459,30 +460,31 @@ userdel postgres</programlisting>
    <title>Preparing the Deployment</title>
    <section id="install_ucpe_mg">
-      <title>Installing the Enea Edge Management</title>
+      <title>Installing the Enea Edge Management application</title>
-      <para>The Enea Edge Management can be installed using a fresh
+      <para>The Enea Edge Management application can be installed using a
-      (first-time) configuration or using a backup file of a previous
+      fresh (first-time) configuration or using a backup file of a previous
      installation, created within the Enea Edge Management GUI.</para>
      <section id="fresh_ucpemg_install">
-        <title>Fresh Installation of the Enea Edge Management</title>
+        <title>Fresh Installation of the Enea Edge Management
+        application</title>
        <para>On the CentOS 7 server open a terminal, log into a bash shell
        with the root account and perform the following:</para>
        <orderedlist>
          <listitem>
            <para>Extract
            <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
            <para>The directory in which the archive has been unpacked will be
-            denoted as: <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+            denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
          </listitem>
          <listitem>
-            <para>Enter <literal>&lt;uCPEM-installdir&gt;/dist</literal>.</para>
+            <para>Enter
+            <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
          </listitem>
          <listitem>
@@ -511,8 +513,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
            <note>
              <para>The same configuration values set now will need to be
-              provided when upgrading or uninstalling the Enea Edge
+              provided when upgrading or uninstalling the Enea Edge Management
-              Management.</para>
+              application.</para>
            </note>
            <itemizedlist>
@@ -527,32 +529,32 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
                  <listitem>
                    <para>Specify the database process password
-                    <literal>[postgres]:</literal></para>
+                    <literal>[postgres]</literal>:</para>
                  </listitem>
                  <listitem>
                    <para>Specify the database ID (or name)
-                    <literal>[ucpemanager]:</literal></para>
+                    <literal>[ucpemanager]</literal>:</para>
                  </listitem>
                  <listitem>
                    <para>Specify the database server port
-                    <literal>[5432]:</literal></para>
+                    <literal>[5432]</literal>:</para>
                  </listitem>
                  <listitem>
                    <para>Specify a database user name
-                    <literal>[postgres]:</literal></para>
+                    <literal>[postgres]</literal>:</para>
                  </listitem>
                  <listitem>
                    <para>Specify a database password
-                    <literal>[postgres]:</literal></para>
+                    <literal>[postgres]</literal>:</para>
                  </listitem>
                  <listitem>
                    <para>Specify the database startup thread pool size
-                    <literal>[1]:</literal></para>
+                    <literal>[1]</literal>:</para>
                  </listitem>
                </itemizedlist>
              </listitem>
@@ -563,17 +565,17 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
                <itemizedlist spacing="compact">
                  <listitem>
                    <para>Specify a service username
-                    [<literal>ucpemanager</literal>]:</para>
+                    <literal>[ucpemanager]:</literal></para>
                  </listitem>
                  <listitem>
                    <para>Specify a service password
-                    <literal>[ucpemanager</literal>]:</para>
+                    <literal>[ucpemanager]</literal>:</para>
                  </listitem>
                </itemizedlist>
              </listitem>
-              <listitem condition="hidden">
+              <listitem>
                <para>High Availability Configurations:</para>
                <itemizedlist>
@@ -597,7 +599,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
              <listitem>
                <para>Create the self-signed certificate: <literal>Specify IP
-                or domain name:</literal></para>
+                or domain name</literal>:</para>
                <note>
                  <para>The certificate can be generated again by running the
@@ -620,12 +622,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
              </listitem>
              <listitem>
-                <para>Install the Enea Edge Management as a service with the
+                <para>Install the Enea Edge Management application as a
-                name <literal>ucpemanager</literal>.</para>
+                service with the name <literal>ucpemanager</literal>.</para>
              </listitem>
              <listitem>
-                <para>Start the <literal>ucpemanager</literal> service</para>
+                <para>Start the <literal>ucpemanager</literal> service.</para>
              </listitem>
            </itemizedlist>
          </listitem>
@@ -639,24 +641,24 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        </orderedlist>
        <note>
-          <para>The IPv4 address of the CentOS 7 Server, connected to the same
+          <para>The IPv4 address of the CentOS 7 Server will be used as a configuration
-          network as the uCPE Devices, will be used as a configuration
          parameter when setting up the uCPE devices.</para>
          <para>If the CentOS 7 Server is installed behind NAT, the IPv4
          address used will be the public IP of the NAT device and port
          forwarding rules must be created to ensure the uCPE device can
-          access the Enea Edge Management. For more details, please see <link
+          access the Enea Edge Management application. For more details,
-          linkend="firewall_config">Firewall Configuration</link>.</para>
+          please see <link linkend="firewall_config">Firewall
+          Configuration</link>.</para>
        </note>
      </section>
      <section id="install_ucpemg_from_backup">
-        <title>Installation of the Enea Edge Management using a System
+        <title>Installation of the Enea Edge Management application using a
-        Back-up</title>
+        System Back-up</title>
-        <para>The Enea Edge Management can be restored if a backup file has
+        <para>The Enea Edge Management application can be restored if a backup
-        been previously created.</para>
+        file has been previously created.</para>
        <para>A backup file can be created by accessing the <emphasis
        role="bold">System</emphasis> menu, and clicking <emphasis
@@ -672,21 +674,21 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        <note>
          <para>The System Back-up file obtained from the Enea Edge Management
          GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
-          different from the snapshot obtained during a Enea Edge Management
+          different from the snapshot obtained during an Enea Edge Management
          Upgrade or Uninstall operation
          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the Enea Edge Management. For more details, see
+          for recovery of the Enea Edge Management application. For more
-          <olink targetdoc="book_enea_nfv_access_getting_started"
+          details, see <olink targetdoc="book_enea_edge_getting_started"
          targetptr="restore_prev_ucpe_install">Restoring a previous Enea Edge
          Management installation 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.</para>
        </note>
-        <para>To install the Enea Edge Management with the restore option
+        <para>To install the Enea Edge Management application with the restore
-        provide an additional argument as shown below during
+        option provide an additional argument as shown below during
        installation:</para>
        <programlisting>./install.sh \
@@ -708,8 +710,7 @@ SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
      <note>
        <para>The <filename>.hddimg</filename> image is available in the
-        <filename>Enea_Edge_Runtime_Platform_
+        <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
-        &lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
        file you downloaded with your release.</para>
      </note>
@@ -719,7 +720,7 @@ SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
      <orderedlist>
        <listitem>
          <para>Copy the <filename>.hddimg</filename> image file provided by
-          Enea, into the CentOS 7 server.</para>
+          Enea, onto the CentOS 7 server.</para>
        </listitem>
        <listitem>
@@ -740,10 +741,9 @@ sdb       8:0    0    111.8G  0   disk
          <programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting>
-          <para>Where
+          <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is
-          <filename>enea-nfv-access-&lt;machine&gt;.hddimg</filename> is the
+          the <filename>.hddimg</filename> file and <literal>sdb</literal> is
-          <filename>.hddimg</filename> file and <literal>sdb</literal> is the
+          the assigned USB device name.</para>
-          assigned USB device name.</para>
        </listitem>
      </orderedlist>
    </section>
@@ -790,8 +790,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        <listitem>
          <para>On the <emphasis role="bold">Requirements</emphasis> page of
-          the Web-installer, the user must confirm the current state of
+          the Web-installer, the user must confirm the the current state of
-          installation prerequisites is inline with the desired state:</para>
+          the installation prerequisites is inline with the desired
+          state:</para>
          <itemizedlist>
            <listitem>
@@ -833,12 +834,12 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
                  does not support IOMMU Group separation, there are certain
                  limitations regarding how the <literal>vfio-pci</literal>
                  driver can be used. For more details, see the <olink
-                  targetdoc="book_enea_nfv_access_release_info"
+                  targetdoc="book_enea_edge_release_info"
                  targetptr="bugs-limitations">Known Issues and Limitations in
                  this Release 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_release_info/1)" /></olink>
+                  xpointer="element(book_enea_edge_release_info/1)" /></olink>
                  Manual.</para>
                </listitem>
              </itemizedlist>
@@ -860,8 +861,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
          <itemizedlist>
            <listitem>
-              <para>The static Enea Edge Management IP Address or FQDN. This can be
+              <para>The static Enea Edge Management IP Address or FQDN. This
-              either:</para>
+              can be either:</para>
              <itemizedlist spacing="compact">
                <listitem>
@@ -878,23 +879,23 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
                <listitem>
                  <para>The Fully Qualified Domain Name (FQDN) of the Enea
-                  uCPE Manager host machine.</para>
+                  Edge Management host machine.</para>
                </listitem>
              </itemizedlist>
            </listitem>
            <listitem>
              <para>The unique identifier of the uCPE device (called
-              "DeviceId" in this guide).</para>
+              "DeviceId" in this Manual).</para>
            </listitem>
            <listitem>
              <para>Customer Tags. They are used for Zero Touch Provisioning
              (ZTP) and can be left empty for a base configuration. What can
              be entered here (if needed), are the tag(s) specified when
-              creating an offline configuration in the Enea Edge Management. A
+              creating an offline configuration in the Enea Edge Management
-              later addition of customer tags can only be done by reinstalling
+              application. A later addition of customer tags can only be done
-              the uCPE devices.</para>
+              by reinstalling the uCPE devices.</para>
            </listitem>
          </itemizedlist>
        </listitem>
@@ -912,8 +913,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
          <itemizedlist>
            <listitem>
              <para>Select a WAN interface to use as the management network
-              interface. This interface is used by the Enea Edge Management to
+              interface. This interface is used by the Enea Edge Management
-              communicate with the uCPE device.</para>
+              application to communicate with the uCPE device.</para>
            </listitem>
            <listitem>
@@ -928,14 +929,14 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      Web-installer, Enea Edge Runtime is installed on the hard drive. At this
      stage, the user should remove the USB stick and the LAN cable, and
      shutdown the uCPE device. It will be started after necessary
-      configurations are done in the Enea Edge Management, as described
+      configurations are done in the Enea Edge Management application, as
-      below.</para>
+      described below.</para>
      <note>
        <para>If errors are detected during installation, full logs will be
        available on the last page of the Web-installer. Please contact Enea
-        for log analysis. The system is not expected to be usable if errors are
+        for log analysis. The system is not expected to be usable if errors
-          reported during installation.</para>
+        are reported during installation.</para>
        <para>If the USB stick was booted in UEFI mode, a UEFI boot entry is
        automatically created and the system will start booting from the hard
@@ -962,12 +963,12 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <itemizedlist>
        <listitem>
          <para>Network connection between the server running the Enea Edge
-          Management and the laptop.</para>
+          Management application and the laptop.</para>
        </listitem>
        <listitem>
          <para>Network connection between the server running the Enea Edge
-          Management and the uCPE device.</para>
+          Management application and the uCPE device.</para>
        </listitem>
      </itemizedlist>
    </section>
@@ -977,15 +978,15 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
    <title>Management of uCPE Devices</title>
    <para>When the installation is complete the uCPE device can be managed in
-    the Enea Edge Management.</para>
+    the Enea Edge Management application.</para>
    <section id="add_offline_config">
      <title>Add a default Offline Configuration</title>
      <para>Zero Touch Provisioning is always turned on when a uCPE device
-      connects to the Enea Edge Management. To enable it in the Enea Edge
+      connects to the Enea Edge Management application. To enable it in the
-      Management, an offline configuration needs to be registered for Day-0
+      Enea Edge Management application, an offline configuration needs to be
-      configuration.</para>
+      registered for Day-0 configuration.</para>
      <note>
        <para>Day-0 configuration is a software lifecycle term referring to
@@ -998,10 +999,10 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <para>The offline configuration consists of data and parameters that are
      meant to be automatically set when a uCPE device connects to the Enea
-      Edge Management for the first time. The configuration is typically
+      Edge Management application for the first time. The configuration is
-      focused on setting up the network management of the uCPE device, e.g.
+      typically focused on setting up the network management of the uCPE
-      configuring network interfaces, WAN and LAN networking and service
+      device, e.g. configuring network interfaces, WAN and LAN networking and
-      chains.</para>
+      service chains.</para>
      <para>For this base configuration, the offline configuration will be
      left blank. The blank offline configuration can be filled with
@@ -1011,33 +1012,35 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <note>
        <para>If the offline configuration is not configured, an alarm will be
        raised: <literal>Day-0 Config:ZTP:Major</literal> when the uCPE device
-        tries to connect to the Enea Edge Management, informing the user that
+        tries to connect to the Enea Edge Management application, informing
-        the ZTP setup failed for the uCPE device.</para>
+        the user that the ZTP setup failed for the uCPE device.</para>
      </note>
-      <para><emphasis role="bold">To create an offline
+      <para><emphasis role="bold">Creating an offline
-      configuration</emphasis><orderedlist>
+      configuration</emphasis></para>
-          <listitem>
-            <para>In a browser access the Enea Edge Management, open <emphasis
-            role="bold">Applications</emphasis> and select <emphasis
-            role="bold">Offline Config</emphasis>.</para>
-          </listitem>
-          <listitem>
+      <orderedlist>
-            <para>Create a new offline configuration in the GUI by selecting
+        <listitem>
-            the <emphasis role="bold">Add</emphasis> button and filling in the
+          <para>In a browser, access the Enea Edge Management application,
-            mandatory fields: <literal>name</literal>,
+          open <emphasis role="bold">Applications</emphasis> and select
-            <literal>deviceVersion</literal> and
+          <emphasis role="bold">Offline Config</emphasis>.</para>
-            <literal>deviceId</literal>.</para>
+        </listitem>
-            <para>The name is user defined and can be set to any unique text
+        <listitem>
-            string identifying the configuration. The
+          <para>Create a new offline configuration in the GUI by selecting the
-            <literal>deviceVersion</literal> must match the Enea Edge Runtime
+          <emphasis role="bold">Add</emphasis> button and filling in the
-            version of the uCPE device and the <literal>deviceId</literal>
+          mandatory fields: <literal>name</literal>,
-            must be the previously set identifier of the uCPE device
+          <literal>deviceVersion</literal> and
-            (DeviceId).</para>
+          <literal>deviceId</literal>.</para>
-          </listitem>
-        </orderedlist></para>
+          <para>The name is user defined and can be set to any unique text
+          string identifying the configuration. The
+          <literal>deviceVersion</literal> must match the Enea Edge Runtime
+          version of the uCPE device and the <literal>deviceId</literal> must
+          be the previously set identifier of the uCPE device
+          (DeviceId).</para>
+        </listitem>
+      </orderedlist>
    </section>
    <section id="add_ucpe_mg">
@@ -1045,10 +1048,10 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <para>In order to enroll a uCPE device in the management system and
      establish a management connection, the user will add uCPE device
-      information in the Enea Edge Management. This is accomplished by going
+      information in the Enea Edge Management application. This is
-      to <emphasis role="bold">Devices</emphasis>, selecting <emphasis
+      accomplished by going to <emphasis role="bold">Devices</emphasis>,
-      role="bold">Manage</emphasis> and then clicking the <emphasis
+      selecting <emphasis role="bold">Manage</emphasis> and then clicking the
-      role="bold">Add</emphasis> button.</para>
+      <emphasis role="bold">Add</emphasis> button.</para>
      <para>The relevant parameters are:</para>
@@ -1060,7 +1063,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        <listitem>
          <para><emphasis role="bold">Name.</emphasis> The name by which the
-          uCPE device is referred to in the Enea Edge Management.
+          uCPE device is referred to in the Enea Edge Management application.
          (Mandatory).</para>
        </listitem>
@@ -1092,22 +1095,22 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      </itemizedlist>
      <para>For more details concerning Device Calls Home, please see <olink
-      targetdoc="book_enea_nfv_access_getting_started"
+      targetdoc="book_enea_edge_getting_started"
      targetptr="device_callhome_nat">Device Call Home Connection for
      Deployment behind NAT 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.</para>
    </section>
    <section id="boot_device_add_map">
      <title>Booting the uCPE device and adding it to the Map</title>
-      <para>When connectivity is established with the Enea Edge Management and
+      <para>When connectivity is established with the Enea Edge Management
-      a uCPE device is already registered with a matching <literal>Device
+      application and a uCPE device is already registered with a matching
-      ID</literal>, the installation is complete, and the connection is
+      <literal>Device ID</literal>, the installation is complete, and the
-      established.</para>
+      connection is established.</para>
      <para>When a uCPE device is registered it can be manually added to the
      map for overview. <emphasis role="bold">Right-click</emphasis> on the
@@ -1116,17 +1119,16 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <para>In case of management connection failure (e.g. due to a
      misconfiguration), the uCPE device status will be seen as RED
-      (disconnected) in the Enea Edge Management. The uCPE device
+      (disconnected) in the Enea Edge Management application. The uCPE device
      configuration can be corrected by removing the WAN cable(s),
      reconnecting the laptop to the LAN interface of the uCPE device and
      rebooting it. At this point, the Web-installer can be accessed from the
-      laptop as described in <olink
+      laptop as described in <olink targetdoc="book_enea_edge_getting_started"
-      targetdoc="book_enea_nfv_access_getting_started"
      targetptr="install_ena_device">Installing Enea Edge - uCPE Device
      installation 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.</para>
    </section>
  </section>
@@ -1134,17 +1136,17 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
  <section id="ucpe_monitor">
    <title>uCPE Device Monitorization and Control</title>
-    <para>Once the uCPE device is connected to the Enea Edge Management 
+    <para>Once the uCPE device is connected to the Enea Edge Management
-      application, it is ready for central management. Two important functions 
+    application, it is ready for central management. Two important functions
-      available in the Enea uCPE Management GUI are alarm checking and resource 
+    available in the Enea Edge Management GUI are alarm checking and resource
-      allocation. Additionally, the device can be rebooted, the factory settings 
+    allocation. Additionally, the device can be rebooted, the factory settings
-      can be restored or simply the vCPE service can be restarted.</para>
+    can be restored or simply the vCPE service can be restarted.</para>
    <section id="check_alarms">
      <title>Checking Alarms</title>
-      <para>The Enea Edge Management dashboard presents alarms in a specific
+      <para>The Enea Edge Management application dashboard presents alarms in
-      window on the front page.</para>
+      a specific window on the front page.</para>
      <para>An alarm can be easily triggered by disconnecting and reconnecting
      the WAN ethernet cable from the uCPE device. The management system will
@@ -1152,15 +1154,16 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      Disconnected::Critical</literal>.</para>
      <para>A separate Alarm Management window can be accessed from the Enea
-      Edge Management menu for in-depth access and programming of Alarms and
+      Edge Management menu for in-depth access and programming of <emphasis
-      Events.</para>
+      role="bold">Alarms and Events</emphasis>.</para>
    </section>
    <section id="ck_resource_alloc">
      <title>Checking uCPE device Resource Allocation</title>
-      <para>When the uCPE device is connected to the Enea Edge Management it
+      <para>When the uCPE device is connected to the Enea Edge Management
-      is of interest to check the amount of hardware resources in use.</para>
+      application it is of interest to check the amount of hardware resources
+      in use.</para>
      <para>To check CPU, RAM and disk utilization simply select the uCPE
      device and go to the <emphasis role="bold">Virtual Machines</emphasis>
@@ -1171,23 +1174,26 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
    <section id="basic_oper_device">
      <title>Basic operations for uCPE device Managememt</title>
-      <para>When the uCPE device is connected to the Enea Edge Management application, it can
+      <para>When the uCPE device is connected to the Enea Edge Management
-      be rebooted, the factory settings can be restored or simply the vCPE
+      application, it can be rebooted, the factory settings can be restored or
-      service can be restarted.</para>
+      simply the vCPE service can be restarted.</para>
      <para>Select the uCPE device and go to the <emphasis
-      role="bold">Operations</emphasis> menu, where the following options are available:</para>
+      role="bold">Operations</emphasis> menu, where the following options are
+      available:</para>
      <itemizedlist>
        <listitem>
-          <para><emphasis role="bold">Reboot</emphasis>. Reboots the device. Settings will be preserved.</para>
+          <para><emphasis role="bold">Reboot</emphasis>. Reboots the device.
+          Settings will be preserved.</para>
        </listitem>
        <listitem>
-          <para><emphasis role="bold">Factory reset</emphasis>. Resets the device to its 
+          <para><emphasis role="bold">Factory reset</emphasis>. Resets the
-          default factory settings. All current configuration settings are lost. All 
+          device to its default factory settings. All current configuration
-          running VNFs are destroyed. Any installed custom scripts will be removed and 
+          settings are lost. All running VNFs are destroyed. Any installed
-          they will need to be reinstalled.</para>
+          custom scripts will be removed and they will need to be
+          reinstalled.</para>
          <para>Only the vCPE service will be restarted, the device will not
          be rebooted. No reboot is needed.</para>
@@ -1220,14 +1226,14 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <note>
        <para>In case the uCPE device was installed behind a NAT device, the
        reverse SSH connection will be used. For more details, please see
-        <olink targetdoc="book_enea_nfv_access_getting_started"
+        <olink targetdoc="book_enea_edge_getting_started"
        targetptr="device_callhome_nat">Device Call Home Connection for
        deployment behind NAT 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.</para>
      </note>
    </section>
  </section>
-</chapter>
+</chapter>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/introduction.xml b/doc/book-enea-edge-getting-started/doc/introduction.xml
index 5786883..eaa5521 100644
--- a/doc/book-enea-edge-getting-started/doc/introduction.xml
+++ b/doc/book-enea-edge-getting-started/doc/introduction.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="intro_ucpe">
  <title>Overview</title>
-  <para>This document describes the Enea Edge and provides installation
+  <para>This document describes Enea Edge and provides installation steps for
-  steps for deploying a base configuration in order to create:</para>
+  deploying a base configuration in order to create:</para>
  <itemizedlist>
    <listitem>
-      <para>A functional Enea Edge Management installation ready to manage uCPE
+      <para>A functional Enea Edge Management installation ready to manage
-      devices.</para>
+      uCPE devices.</para>
    </listitem>
    <listitem>
@@ -32,44 +32,42 @@
    <itemizedlist>
      <listitem>
-        <para>The Enea Edge Runtime, which acts as the host
+        <para>Enea Edge Runtime, which acts as the host for Virtualized
-        for Virtualized Network Functions (VNFs) and provides management over
+        Network Functions (VNFs) and provides management over NETCONF.</para>
-        NETCONF.</para>
      </listitem>
      <listitem>
-        <para>The Enea Edge Management, a solution that runs on an external
+        <para>Enea Edge Management, an application that runs on an external
        server, used for VNF Management and managing large numbers of uCPE
        devices.</para>
      </listitem>
    </itemizedlist>
+    <para>In addition, Enea Edge includes a framework for automation and
-    <para>In addition, Enea Edge includes a framework for
+    testing. More information can be found in the <xi:include
-    automation and testing. More information can be found in
+    href="../../s_docbuild/olinkdb/pardoc-common.xml"
-    <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)" />.</para>
+    xpointer="element(book_enea_edge_automation_user_guide/1)" />.</para>
    <para>Details concerning release content, including documentation
    structure, are provided in the <xi:include
    href="../../s_docbuild/olinkdb/pardoc-common.xml"
    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_release_info/1)" /> Manual included
+    xpointer="element(book_enea_edge_release_info/1)" /> Manual included
    with your release.</para>
    <section id="nfv_access">
      <title>Enea Edge Runtime</title>
-      <para>Enea Edge Runtime is a lightweight,
+      <para>Enea Edge Runtime is a lightweight, multi-architecture
-      multi-architecture virtualization platform built on de-facto standards
+      virtualization platform built on de-facto standards in an SDN/NFV
-      in an SDN/NFV ecosystem. It is designed for a high networking
+      ecosystem. It is designed for a high networking performance with minimal
-      performance with minimal hardware footprint, by only providing relevant
+      hardware footprint, by only providing relevant functionalties and
-      functionalties and technologies.</para>
+      technologies.</para>
      <para>Virtualization methods include Virtual Machines (KVM / QEMU) and
      container(s) (Docker). High networking throughput and low latency are
-      ensured by accelerated data plane relying on technologies like DPDK,
+      ensured by an accelerated data plane relying on technologies like DPDK,
      OVS-DPDK and SR-IOV/PCI-Passthrough. Key functionalities, such as
      platform software management, virtualized networking, VNFs life-cycle
      management and FCAPS are provided through the YANG-modelled NETCONF
@@ -90,13 +88,14 @@
    <section id="ucpe_manager">
      <title>Enea Edge Management</title>
-      <para>The Enea Edge Management is centralized control system providing
+      <para>The Enea Edge Management application is a centralized control system providing
-      uCPEs domain management capabilities through a GUI and REST API. It can
+      domain management capabilities to uCPEs through a GUI and REST API. It can
      be deployed on a host or a virtual machine running 64-bit CentOS 7 on an
-      x86 platform. The Enea Edge Management uses a southbound NETCONF protocol
+      x86 platform. The Enea Edge Management application uses a southbound NETCONF
-      to connect and manage uCPE devices.</para>
+      protocol to connect and manage uCPE devices.</para>
-      <para>The Enea Edge Management provides the following key features:</para>
+      <para>The Enea Edge Management application provides the following key
+      features:</para>
      <itemizedlist>
        <listitem>
@@ -144,8 +143,8 @@
            <row>
              <entry>Enea Edge</entry>
-              <entry>The Enea Edge Runtime and the Enea Edge
+              <entry>The Enea Edge Runtime and Enea Edge
-              Management.</entry>
+              Management solutions.</entry>
            </row>
            <row>
@@ -158,15 +157,14 @@
            <row>
              <entry>Enea Edge Management</entry>
-              <entry>Enea Universal Customer Premises Equipment
+              <entry>The Enea Universal Customer Premises Equipment
              Manager.</entry>
            </row>
            <row>
              <entry>uCPE device</entry>
-              <entry>A whitebox running the Enea Edge
+              <entry>A whitebox running the Enea Edge Runtime.</entry>
-              Runtime.</entry>
            </row>
          </tbody>
        </tgroup>
diff --git a/doc/book-enea-edge-getting-started/doc/log_collector.xml b/doc/book-enea-edge-getting-started/doc/log_collector.xml
index baa1340..1148dc2 100644
--- a/doc/book-enea-edge-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-edge-getting-started/doc/log_collector.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="log_collector">
  <title>Using the Log Collector</title>
-  <para>Troubleshooting problems on the uCPE device require an analysis of a
+  <para>Troubleshooting problems on a uCPE device require an analysis of a set
-  set of information i.e. logs collected from the uCPE device and/or the Enea
+  of data and information i.e. logs collected from the uCPE device and/or the
-  Edge Management. The following information describes how the log collection
+  Enea Edge Management application. The following information describes how
-  mechanism works.</para>
+  the log collection mechanism works.</para>
  <section id="log_collect_ucpem">
-    <title>Log collecting using the Enea Edge Management</title>
+    <title>Log collecting using the Enea Edge Management application</title>
-    <para>The Enea Edge Management allows for collecting a set of logs and state
+    <para>The Enea Edge Management application allows for collecting a set of
-    information from a uCPE device.</para>
+    logs and state information from a uCPE device.</para>
    <section id="log_collect">
      <title>Collecting the Logs</title>
@@ -31,7 +31,8 @@
        </listitem>
        <listitem>
-          <para>Press the <emphasis role="bold">Execute</emphasis> button.</para>
+          <para>Press the <emphasis role="bold">Execute</emphasis>
+          button.</para>
          <para>A success message is shown in the same window as shown below.
          At this moment, the process of collecting logs on the uCPE device
@@ -53,9 +54,9 @@
      <note>
        <para>It might take some time for the archive to be created. When the
        operation completes, a "CollectLogsComplete" notification is sent from
-        the uCPE device to the Enea Edge Management. This can be viewed in the
+        the uCPE device to the Enea Edge Management application. This can be
-        GUI in the <emphasis role="bold">Faults</emphasis> menu, after selecting 
+        viewed in the GUI in the <emphasis role="bold">Faults</emphasis> menu,
-<emphasis role="bold">Events</emphasis>.</para>
+        after selecting <emphasis role="bold">Events</emphasis>.</para>
        <figure>
          <title>Collecting Debug Logs</title>
@@ -74,12 +75,13 @@
      <title>View collected Logs</title>
      <para>A list with the archives containing already collected logs will be
-      shown in the <emphasis role="bold">Device File Listing</emphasis> table:</para>
+      shown in the <emphasis role="bold">Device File Listing</emphasis>
+      table:</para>
      <orderedlist>
        <listitem>
-          <para>Access <emphasis role="bold">Files</emphasis> and then the 
+          <para>Access the <emphasis role="bold">Files</emphasis> menu and
-<emphasis role="bold">Download</emphasis> button.</para>
+          select the <emphasis role="bold">Download</emphasis> button.</para>
        </listitem>
        <listitem>
@@ -100,9 +102,9 @@
      <note>
        <para>If the filename you specified does not appear, it might still be
-        in the process of creation. Click on the <emphasis role="bold">Refresh</emphasis> 
+        in the process of creation. Click on the <emphasis
-        icon at the bottom of the table until you can see the desired file
+        role="bold">Refresh</emphasis> icon at the bottom of the table until
-        listing.</para>
+        you can see the desired file listing.</para>
      </note>
    </section>
@@ -110,12 +112,12 @@
      <title>Downloading Logs from the uCPE Device</title>
      <para>This option transfers a debug file archive from the uCPE device to
-      Enea Edge Management.</para>
+      Enea Edge Management application.</para>
      <orderedlist>
        <listitem>
-          <para>Access <emphasis role="bold">Files</emphasis> and choose the 
+          <para>Access the <emphasis role="bold">Files</emphasis> menu and
-          <emphasis role="bold">Download</emphasis> button.</para>
+          select the <emphasis role="bold">Download</emphasis> button.</para>
        </listitem>
        <listitem>
@@ -123,17 +125,17 @@
        </listitem>
        <listitem>
-          <para>In the <emphasis role="bold">Device File Listing</emphasis> table, select
+          <para>In the <emphasis role="bold">Device File Listing</emphasis>
-          the archive you want to download from the uCPE device to Enea Edge
+          table, select the archive you want to download from the uCPE device
-          Management.</para>
+          to Enea Edge Management.</para>
        </listitem>
        <listitem>
-          <para>Press the <emphasis role="bold">Download from Device</emphasis> 
+          <para>Press the <emphasis role="bold">Download from
-          button.</para>
+          Device</emphasis> button.</para>
          <para>The archive will be downloaded from the uCPE device and stored
-          on the Enea Edge Management.</para>
+          on the Enea Edge Management application.</para>
        </listitem>
      </orderedlist>
@@ -146,30 +148,33 @@
    <section id="download_logs_locally">
      <title>Downloading collected Logs locally</title>
-      <para>This option downloads a logs archive from the Enea Edge Management to
+      <para>This option downloads a logs archive from the Enea Edge Management
-      a local (user) machine for analysis. The archive must first be available
+      application to a local (user) machine for analysis. The archive must
-      in the Enea Edge Management in order to be downloaded.</para>
+      first be available in the Enea Edge Management application in order to
+      be downloaded.</para>
      <orderedlist>
        <listitem>
-          <para>Access the <emphasis role="bold">Devices</emphasis> menu and select 
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu and
-<emphasis role="bold">Files</emphasis>.</para>
+          select <emphasis role="bold">Files</emphasis>.</para>
        </listitem>
        <listitem>
-          <para>Select the <emphasis role="bold">Downloaded Files</emphasis> tab.</para>
+          <para>Select the <emphasis role="bold">Downloaded Files</emphasis>
+          tab.</para>
        </listitem>
        <listitem>
-          <para>Select an archive from the <emphasis role="bold">Downloaded Files</emphasis> 
+          <para>Select an archive from the <emphasis role="bold">Downloaded
-          table.</para>
+          Files</emphasis> table.</para>
        </listitem>
        <listitem>
-          <para>Click the <emphasis role="bold">Download</emphasis> button.</para>
+          <para>Click the <emphasis role="bold">Download</emphasis>
+          button.</para>
-          <para>The file will be downloaded in browser's download
+          <para>The file will be downloaded in the download folder of the
-          folder.</para>
+          supported browser in use.</para>
          <figure>
            <title>Downloaded Files Table</title>
@@ -189,12 +194,13 @@
      <title>Deleting a Logs Archive from a uCPE device</title>
      <para>Use this option when you want to delete unnecessary collected logs
-      on the uCPE device.</para>
+      on a uCPE device.</para>
      <orderedlist>
        <listitem>
-          <para>Access <emphasis role="bold">Files</emphasis> and then click the 
+          <para>Access the <emphasis role="bold">Files</emphasis> menu and
-          <emphasis role="bold">Download</emphasis> button.</para>
+          then click the <emphasis role="bold">Download</emphasis>
+          button.</para>
        </listitem>
        <listitem>
@@ -202,12 +208,14 @@
        </listitem>
        <listitem>
-          <para>In the <emphasis role="bold">Device File Listing</emphasis> table, select
+          <para>In the <emphasis role="bold">Device File Listing</emphasis>
-          the archive you want to delete from the uCPE device.</para>
+          table, select the archive you want to delete from the uCPE
+          device.</para>
        </listitem>
        <listitem>
-          <para>Press the <emphasis role="bold">Delete</emphasis> button.</para>
+          <para>Press the <emphasis role="bold">Delete</emphasis>
+          button.</para>
          <para>The archive will be deleted from the uCPE device and the table
          will be updated.</para>
@@ -218,8 +226,9 @@
      <orderedlist>
        <listitem>
-          <para>Access the <emphasis role="bold">Operations</emphasis> menu and 
+          <para>Access the <emphasis role="bold">Operations</emphasis> menu
-select <emphasis role="bold">Delete Debug Log Archive</emphasis>.</para>
+          and select <emphasis role="bold">Delete Debug Log
+          Archive</emphasis>.</para>
        </listitem>
        <listitem>
@@ -227,7 +236,8 @@ select <emphasis role="bold">Delete Debug Log Archive</emphasis>.</para>
        </listitem>
        <listitem>
-          <para>Press the <emphasis role="bold">Execute</emphasis> button.</para>
+          <para>Press the <emphasis role="bold">Execute</emphasis>
+          button.</para>
          <para>A success message is displayed if the file is deleted from the
          uCPE device correctly.</para>
@@ -236,55 +246,59 @@ select <emphasis role="bold">Delete Debug Log Archive</emphasis>.</para>
    </section>
    <section id="delete_archives_ucpem">
-      <title>Deleting a Logs Archive from the Enea Edge Management</title>
+      <title>Deleting a Logs Archive from the Enea Edge Management
+      application</title>
-      <para>This option deletes a logs archive from the Enea Edge
+      <para>This option deletes a logs archive from the Enea Edge Management
-      Management.</para>
+      application.</para>
      <orderedlist>
        <listitem>
-          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then select 
+          <para>Access the <emphasis role="bold">Devices</emphasis> menu, then
-          <emphasis role="bold">Files</emphasis>.</para>
+          select <emphasis role="bold">Files</emphasis>.</para>
        </listitem>
        <listitem>
-          <para>Select the <emphasis role="bold">Downloaded Files</emphasis> tab.</para>
+          <para>Select the <emphasis role="bold">Downloaded Files</emphasis>
+          tab.</para>
        </listitem>
        <listitem>
-          <para>Select an archive from the <emphasis role="bold">Downloaded Files</emphasis> 
+          <para>Select an archive from the <emphasis role="bold">Downloaded
-table.</para>
+          Files</emphasis> table.</para>
        </listitem>
        <listitem>
-          <para>Click the <emphasis role="bold">Delete</emphasis> button.</para>
+          <para>Click the <emphasis role="bold">Delete</emphasis>
+          button.</para>
-          <para>The file will be deleted from the Enea Edge Management and the
+          <para>The file will be deleted from the Enea Edge Management
-          table will be updated.</para>
+          application and the table will be updated.</para>
        </listitem>
      </orderedlist>
      <note>
-        <para>Deleting the logs file from the Enea Edge Management does not
+        <para>Deleting the logs file from the Enea Edge Management application
-        affect the file located on the uCPE device.</para>
+        does not affect the file located on the uCPE device.</para>
      </note>
    </section>
    <section condition="hidden" id="enable_disable_via_perms">
-      <title>Enabling/Disabling of the Log Collector via Permissions</title>
+      <title>Enabling/Disabling the Log Collector via Permissions</title>
      <para>To disable the ability to access/download the uCPE device's
-      debug-log files from the Enea Edge Management, the appropriate permissions
+      debug-log files from the Enea Edge Management application, the
-      must be changed:</para>
+      appropriate permissions must be changed:</para>
      <orderedlist>
        <listitem>
-          <para>Access the <emphasis role="bold">Security</emphasis> menu, 
+          <para>Access the <emphasis role="bold">Security</emphasis> menu,
-then select <emphasis role="bold">Configuration</emphasis>.</para>
+          then select <emphasis role="bold">Configuration</emphasis>.</para>
        </listitem>
        <listitem>
-          <para>Click the <emphasis role="bold">Security Groups</emphasis> tab.</para>
+          <para>Click the <emphasis role="bold">Security Groups</emphasis>
+          tab.</para>
        </listitem>
        <listitem>
@@ -292,18 +306,19 @@ then select <emphasis role="bold">Configuration</emphasis>.</para>
        </listitem>
        <listitem>
-          <para>Click the <emphasis role="bold">Permissions</emphasis> tab on the right
+          <para>Click the <emphasis role="bold">Permissions</emphasis> tab on
-          side.</para>
+          the right side.</para>
        </listitem>
        <listitem>
-          <para>Click the <emphasis role="bold">Devices</emphasis> tab like in the image
+          <para>Click the <emphasis role="bold">Devices</emphasis> tab like in
-          below.</para>
+          the image below.</para>
        </listitem>
        <listitem>
-          <para>Change the <emphasis role="bold">Device File Management</emphasis> option to
+          <para>Change the <emphasis role="bold">Device File
-          <emphasis role="bold">none</emphasis> to disable the feature.</para>
+          Management</emphasis> option to <emphasis
+          role="bold">none</emphasis> to disable the feature.</para>
        </listitem>
      </orderedlist>
@@ -322,29 +337,30 @@ then select <emphasis role="bold">Configuration</emphasis>.</para>
    <section id="download_ucpemg_logs">
      <title>Downloading Enea Edge Management Logs</title>
-      <para>Often, sending the Enea Edge Management logs together with collected
+      <para>Often, sending the Enea Edge Management logs together with
-      uCPE device logs to the support team provides important information for
+      collected uCPE device logs to the support team provides important
-      troubleshooting (especially in cases of connectivity issues with the
+      information for troubleshooting (especially in cases of connectivity
-      uCPE device and error popups).</para>
+      issues with the uCPE device and error popups).</para>
      <para>Enea Edge Management log files are located in
-      <filename>application/logs/</filename> in the Enea Edge Management's
+      <filename>application/logs/</filename> in the Enea Edge Management
-      installation folder
+      application's installation folder
      (e.g.<filename>/opt/ems/ucpemanager/application/logs</filename>). They
      can be copied from that location, or they can be downloaded using the
      Enea Edge Management GUI by performing the following:</para>
      <orderedlist>
        <listitem>
-          <para>Access <emphasis role="bold">Test</emphasis>, then <emphasis role="bold">Debug
+          <para>Access <emphasis role="bold">Test</emphasis>, then <emphasis
-          Settings</emphasis> and select the <emphasis role="bold">Log Files</emphasis> tab.</para>
+          role="bold">Debug Settings</emphasis> and select the <emphasis
+          role="bold">Log Files</emphasis> tab.</para>
        </listitem>
        <listitem>
          <para>Select the desired log file
          (<filename>ucpemanager.log</filename> or
-          <filename>watchdog.log</filename>) and press the
+          <filename>watchdog.log</filename>) and press the <emphasis
-          <emphasis role="bold">Download</emphasis> button.</para>
+          role="bold">Download</emphasis> button.</para>
        </listitem>
        <listitem>
@@ -372,12 +388,13 @@ then select <emphasis role="bold">Configuration</emphasis>.</para>
  </section>
  <section id="log_collect_no_ucpem">
-    <title>Log collecting without using the Enea Edge Management</title>
+    <title>Log collecting without using the Enea Edge Management
+    application</title>
    <para>Log collection from uCPE Devices can also be done when there is no
-    Enea Edge Management connection. A SSH connection to uCPE Device is needed
+    Enea Edge Management connection. A SSH connection to the uCPE Device is
-    for use of the log collector script, which can be found in the uCPE Device
+    needed for use of the log collector script, which can be found in the uCPE
-    file system in <literal>/usr/local/enea/</literal>.</para>
+    Device file system in <literal>/usr/local/enea/</literal>.</para>
    <para>The Log collector script takes relevant information about the system
    and collects it in an archive:</para>
@@ -385,7 +402,7 @@ then select <emphasis role="bold">Configuration</emphasis>.</para>
    <programlisting>./log-collector.sh -p &lt;LOG_PATHh&gt; -n &lt;ARCHIVE_NAME&gt;</programlisting>
    <para>Where <literal>-p</literal> is the path where the log archive will
-    be saved, <literal>-n</literal> is the archive name.</para>
+    be saved, and <literal>-n</literal> is the archive name.</para>
    <note>
      <para>If <literal>-p</literal> is not provided, the default path will be
diff --git a/doc/book-enea-edge-getting-started/doc/net_config_options.xml b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
index 344b79b..ff513c9 100644
--- a/doc/book-enea-edge-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="net_config_operations">
  <title>Network Configuration Options</title>
-  <para>Various Advanced Network Configuration options can be done from Enea
+  <para>Various Advanced Network Configuration options can be done from the
-  Edge Management GUI.</para>
+  Enea Edge Management application GUI.</para>
  <section id="device_callhome_nat">
    <title>Device Call Home Connection for Deployment behind NAT</title>
    <para>The Device Call Home option enables the initiation of the connection
-    between the uCPE Device and the Enea Edge Management, from the uCPE
+    between the uCPE Device and the Enea Edge Management application, from the
-    device. The Device Call Home option is required when deploying a uCPE
+    uCPE device. The Device Call Home option is required when deploying a uCPE
    device behind NAT since the IP address of the uCPE device is hidden for
-    the Enea Edge Management.</para>
+    the Enea Edge Management application.</para>
    <para>Enable Device Call Home by marking the Device Call Home checkbox
-    when registering the uCPE device in Enea Edge Management. When using this
+    when registering the uCPE device in Enea Edge Management application. When
-    mechanism, the device will initiate a connection to the Enea Edge
+    using this mechanism, the device will initiate a connection to the Enea
-    Management for NETCONF traffic (over SSH), while the Enea Edge Management
+    Edge Management application for NETCONF traffic (over SSH), while the
-    waits for a device connection.</para>
+    application waits for a device connection.</para>
  </section>
  <section id="device_net_config">
@@ -30,7 +30,7 @@
    selecting physical interfaces to be used by virtualized networking and
    creating different types of bridges to enable VNF communication.</para>
-    <para>The Zero Touch Provisioning mechanism is also touched upon, as
+    <para>The Zero Touch Provisioning mechanism is also touched upon, as an
    alternative to manual configuration of the virtualization
    infrastructure.</para>
@@ -52,9 +52,9 @@
        configurations have been made.</para>
      </note>
-      <para>In <emphasis role="bold">Configuration</emphasis>, select
+      <para>In the <emphasis role="bold">Configuration</emphasis> menu, select
-      <emphasis role="bold">DPDK</emphasis> where DPDK resources can also be
+      <emphasis role="bold">DPDK</emphasis>, here DPDK resources can also be
-      configured such as:</para>
+      configured:</para>
      <itemizedlist>
        <listitem>
@@ -90,8 +90,8 @@
      virtualization infrastructure and VNFs, they must be configured into the
      management system.</para>
-      <para>To add an interface into the Enea Edge Management, select the uCPE
+      <para>To add an interface into the Enea Edge Management application,
-      device, then from the top toolbar select <emphasis
+      select the uCPE device, then from the top toolbar select <emphasis
      role="bold">Configuration</emphasis>, then <emphasis
      role="bold">External Interfaces</emphasis>, <emphasis
      role="bold">Configuration</emphasis>, and click the <emphasis
@@ -191,10 +191,10 @@
        <title>Wan Interface Type</title>
        <para>WAN interfaces configured during the installation of the uCPE
-        device are automatically added in the Enea Edge Management as type
+        device are automatically added in the Enea Edge Management application
-        <literal>wan</literal>. The WAN interface used for management of the
+        as type <literal>wan</literal>. The WAN interface used for management
-        uCPE device is marked with the <literal>Management</literal> property
+        of the uCPE device is marked with the <literal>Management</literal>
-        set to <literal>True</literal>.</para>
+        property set to <literal>True</literal>.</para>
        <para>If a WAN interface is to be assigned for use by a VNF, it must
        be changed into another interface type depending on the type of
@@ -305,9 +305,10 @@
        <note>
          <para>Correct <emphasis role="bold">Country Code</emphasis>
          selection is mandatory. All configuration options are available in
-          the Enea Edge Management GUI but only the Radio Settings that
+          the Enea Edge Management application GUI but only the Radio Settings
-          conform with the selected country's official regulatory laws will be
+          that conform with the selected country's official regulatory laws
-          applied when the Wireless AP is started on the uCPE Device.</para>
+          will be applied when the Wireless AP is started on the uCPE
+          Device.</para>
        </note>
      </section>
@@ -429,7 +430,8 @@
        <itemizedlist>
          <listitem>
            <para><emphasis role="bold">Device management</emphasis>. Part of
-            the device configuration done by the Enea Edge Management.</para>
+            the device configuration done by the Enea Edge Management
+            application.</para>
          </listitem>
          <listitem>
@@ -558,7 +560,8 @@
      <para>If the offline configuration is not configured for a uCPE device,
      an alarm will be raised: <literal>Day-0 Config:ZTP:Major</literal>,
      which occurs when the uCPE device connects to the Enea Edge Management
-      informing that the ZTP setup failed for the specific uCPE device.</para>
+      application informing that the ZTP setup failed for the specific uCPE
+      device.</para>
      <para>To create an offline configuration, select from the top toolbar
      the <emphasis role="bold">Applications</emphasis> menu, then <emphasis
@@ -602,10 +605,10 @@
      Edge version of the uCPE device and the Device ID will be set to the
      previously set identifier of the uCPE device.</para>
-      <para>When a device connects to the Enea Edge Management for the first
+      <para>When a device connects to the Enea Edge Management application for
-      time, it checks the device to see if it has been Zero Touch Provisioned
+      the first time, it checks the device to see if it has been Zero Touch
-      (ZTP). If not, it looks for an offline configuration that matches these
+      Provisioned (ZTP). If not, it looks for an offline configuration that
-      values, in the following order:</para>
+      matches these values, in the following order:</para>
      <itemizedlist>
        <listitem>
@@ -633,9 +636,9 @@
      <note>
        <para>The ZTP will only be triggered the first time a uCPE device
-        connects to the Enea Edge Management. Just changing an offline
+        connects to the Enea Edge Management application. Just changing an
-        configuration will not push the new changes to the device. If an
+        offline configuration will not push the new changes to the device. If
-        offline configuration is changed after uCPE device registration, a
+        an offline configuration is changed after uCPE device registration, a
        factory reset can be executed to force a new ZTP to execute. Select
        the device, then access the <emphasis
        role="bold">Operations</emphasis> menu and select <emphasis
@@ -655,9 +658,9 @@
    <section id="upload_scripts">
      <title>Uploading Scripts</title>
-      <para>The scripts need to be uploaded to the Enea Edge Management prior
+      <para>The scripts need to be uploaded to the Enea Edge Management
-      to use. When uploading scripts to the Enea Edge Management make sure to
+      application prior to use. When uploading scripts to the Enea Edge
-      select the right script type.</para>
+      Management application make sure to select the right script type.</para>
      <para>The following script types are supported:</para>
@@ -736,7 +739,7 @@
          <para>Select the script you want to delete from the <emphasis
          role="bold">Uploaded Scripts</emphasis> tab and then click <emphasis
          role="bold">Delete</emphasis>, which will remove the script
-          immediately from the Enea Edge Management.</para>
+          immediately from the Enea Edge Management application.</para>
        </listitem>
      </orderedlist>
    </section>
@@ -907,4 +910,4 @@
      Interfaces</emphasis>.</para>
    </note>
  </section>
-</chapter>
+</chapter>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
index 4984a35..fcf991e 100644
--- a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="troubleshooting">
  <title>Troubleshooting and Recovery</title>
  <para>In all scenarios where possible, collect the logs for debugging. More
  information on log collecting can be found in <olink
-  targetdoc="book_enea_nfv_access_getting_started"
+  targetdoc="book_enea_edge_getting_started" targetptr="log_collector">Using
-  targetptr="log_collector">Using the Log Collector in the <xi:include
+  the Log Collector 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.</para>
  <para>The following is a small list of possible Enea Edge problems, and
  their solutions. If you encounter other issues or can't get Enea Edge to
  work successfully after consulting the information below, please use the
-  <olink targetdoc="book_enea_nfv_access_release_info"
+  <olink targetdoc="book_enea_edge_release_info"
  targetptr="contacting_enea_support">Enea Support Team Form, available 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_release_info/1)" /></olink> Manual
+  xpointer="element(book_enea_edge_release_info/1)" /></olink> Manual
  downloaded with your release.</para>
  <table>
@@ -38,18 +38,18 @@
      <tbody>
        <row>
          <entry>A uCPE device fails to connect to the Enea Edge Management
-          after installation.</entry>
+          application after installation.</entry>
          <entry>If the uCPE device is not able to connect to the Enea Edge
-          Management after an installation, the Web-installer application is
+          Management application after an installation, the Web-installer
-          started automatically on the uCPE device to change the configuration
+          application is started automatically on the uCPE device to change
-          via a web browser. Please see <olink
+          the configuration via a web browser. Please see <olink
-          targetdoc="book_enea_nfv_access_getting_started"
+          targetdoc="book_enea_edge_getting_started"
          targetptr="boot_device_add_map">Booting the uCPE device and adding
          it to the Map 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.</entry>
        </row>
@@ -65,12 +65,11 @@
              <listitem>
                <para>Reinitiate the Upgrade procedure according to the steps
-                in section <olink
+                in section <olink targetdoc="book_enea_edge_getting_started"
-                targetdoc="book_enea_nfv_access_getting_started"
                targetptr="upgrade_devices">uCPE device upgrades 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.</para>
              </listitem>
            </orderedlist></entry>
@@ -78,22 +77,22 @@
        <row>
          <entry>After a failed uCPE device upgrade the previous Enea Edge
-          image (from the GRUB menu) does not boot.</entry>
+          Runtime image (from the GRUB menu) does not boot.</entry>
-          <entry>Reinstall Enea Edge on the uCPE device and redeploy the
+          <entry>Reinstall Enea Edge Runtime on the uCPE device and redeploy
-          initial configuration and virtualized services, by following the
+          the initial configuration and virtualized services, by following the
-          steps in <olink targetdoc="book_enea_nfv_access_getting_started"
+          steps in <olink targetdoc="book_enea_edge_getting_started"
          targetptr="install_ena_device">Installing Enea Edge - uCPE Device
          installation 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.</entry>
        </row>
        <row>
-          <entry>The Enea Edge Management upgrade fails and a working snapshot
+          <entry>The Enea Edge Management application upgrade fails and a
-          is available.</entry>
+          working snapshot is available.</entry>
          <entry>If a working snapshot obtained during a previous Upgrade or
          Uninstall is available
@@ -107,20 +106,21 @@
              <listitem>
                <para>Restore the previous installation as described in <olink
-                targetdoc="book_enea_nfv_access_getting_started"
+                targetdoc="book_enea_edge_getting_started"
                targetptr="restore_prev_ucpe_install">Restoring a previous
                Enea Edge Management installation 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.</para>
              </listitem>
            </orderedlist></entry>
        </row>
        <row>
-          <entry>The Enea Edge Management upgrade fails and no working
+          <entry>The Enea Edge Management application upgrade fails and no
-          snapshot is available, but a System Back-up file exists.</entry>
+          working snapshot is available, but a System Back-up file
+          exists.</entry>
          <entry><orderedlist>
              <listitem>
@@ -132,20 +132,21 @@
              <listitem>
                <para>Perform an installation with the restore option of a
                previous Enea Edge Management configuration as described in
-                <olink targetdoc="book_enea_nfv_access_getting_started"
+                <olink targetdoc="book_enea_edge_getting_started"
                targetptr="install_ucpemg_from_backup">Installation of the
-                Enea Edge Management using a System Back-up in the <xi:include
+                Enea Edge Management application using a System Back-up in the
-                href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                <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.</para>
              </listitem>
            </orderedlist></entry>
        </row>
        <row>
-          <entry>The uCPE device is booted, the ssh connection is available
+          <entry>The uCPE device is booted, the SSH connection is available
-          but the device is not connected to the Enea Edge Management.</entry>
+          but the device is not connected to the Enea Edge Management
+          application.</entry>
          <entry><orderedlist>
              <listitem>
@@ -155,12 +156,13 @@
              <listitem>
                <para>Use the <emphasis role="bold">Reconnect</emphasis>
-                button from the Enea Edge Management's GUI.</para>
+                button from the Enea Edge Management applications's
+                GUI.</para>
              </listitem>
              <listitem>
-                <para>Connect to uCPE Device console and run the factory reset
+                <para>Connect to the uCPE Device console and run the factory
-                script:</para>
+                reset script:</para>
                <programlisting>/usr/local/odm/bin/factory_reset.sh</programlisting>
              </listitem>
@@ -168,12 +170,12 @@
              <listitem>
                <para>If the above actions do not work, reinstall and
                reconfigure the device using the steps provided in <olink
-                targetdoc="book_enea_nfv_access_getting_started"
+                targetdoc="book_enea_edge_getting_started"
                targetptr="install_ena_device">Installing Enea Edge - uCPE
                Device installation 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.</para>
              </listitem>
            </orderedlist></entry>
@@ -185,12 +187,12 @@
          <entry>Perform a hardware reboot on the uCPE device. If the problem
          is not fixed, reinstall and reconfigure the device using the steps
-          provided in <olink targetdoc="book_enea_nfv_access_getting_started"
+          provided in <olink targetdoc="book_enea_edge_getting_started"
          targetptr="install_ena_device">Installing Enea Edge - uCPE Device
          installation 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.</entry>
        </row>
@@ -208,7 +210,7 @@
                <para>Reboot the device by accessing <emphasis
                role="bold">Operations</emphasis> and then selecting <emphasis
                role="bold">Reboot</emphasis> from within the Enea Edge
-                Management.</para>
+                Management application.</para>
              </listitem>
              <listitem>
diff --git a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index 9680a0c..80473cb 100644
--- a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -1,19 +1,20 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="upgrade_ena">
  <title>Upgrading Enea Edge</title>
  <para>Enea provides regular releases that will require the upgrading of Enea
-  Edge components. The Enea Edge Management must be upgraded first, followed
+  Edge components. The Enea Edge Management application must be upgraded
-  by upgrading the Enea Edge Runtime on the uCPE devices.</para>
+  first, followed by upgrading the Enea Edge Runtime on the uCPE
+  devices.</para>
  <section id="upgrade_mg">
-    <title>Upgrading the Enea Edge Management</title>
+    <title>Upgrading the Enea Edge Management application</title>
    <note>
-      <para>It is recommended to create a system backup by accessing <emphasis
+      <para>It is recommended to create a system backup by accessing the
-      role="bold">System</emphasis> and selecting <emphasis role="bold">System
+      <emphasis role="bold">System</emphasis> menu and selecting <emphasis
-      Backup</emphasis> from the Enea Edge Management GUI, for recovery in
+      role="bold">System Backup</emphasis> from the Enea Edge Management GUI,
-      case of an upgrade failure.</para>
+      for recovery in case of an upgrade failure.</para>
    </note>
    <orderedlist>
@@ -23,11 +24,11 @@
        folder.</para>
        <para>The directory in which the archive has been unpacked will be
-        denoted as <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+        denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
      </listitem>
      <listitem>
-        <para>Enter <literal>&lt;uCPEM-installdir&gt;/dist</literal>.</para>
+        <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
      </listitem>
      <listitem>
@@ -53,11 +54,11 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        application folder
        (<filename>ucpemanager-Back-up-YYYYddMMHHmm.tar.gz</filename>), which
        contains a snapshot of the existing installation in the
-        <literal>&lt;uCPEM-installdir&gt;/dist</literal> directory.</para>
+        <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
        <note>
          <para>The snapshot file created during the upgrade can be used for
-          restoring the Enea Edge Management.</para>
+          restoring the Enea Edge Management application.</para>
        </note>
      </listitem>
@@ -71,23 +72,22 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
      </listitem>
    </itemizedlist>
-    <para><olink targetdoc="book_enea_nfv_access_getting_started"
+    <para><olink targetdoc="book_enea_edge_getting_started"
-    targetptr="fresh_ucpemg_install">Fresh Installation of the Enea Edge Management
+    targetptr="fresh_ucpemg_install">Fresh Installation of the Enea Edge
-    in the <ns:include
+    Management in the <ns:include
    href="../../s_docbuild/olinkdb/pardoc-names.xml"
    xmlns:ns="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
-    Manual contains information about the input required to be entered during
+    contains information about the input required to be entered during the
-    the execution of the upgrade script.</para>
+    execution of the upgrade script.</para>
+    <para condition="hidden">For an example on how to upgrade an Enea Edge
-    <para condition="hidden">For an example on how to upgrade an Enea Edge Management installation
+    Management installation in a High Availability setup, consult <olink
-    in a High Availability setup, consult <olink
+    targetdoc="book_enea_edge_getting_started"
-    targetdoc="book_enea_nfv_access_getting_started"
    targetptr="ha_upgrade">Upgrading a High Availability Deployment in the
    <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
    xmlns:ns="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.</para>
    <section id="restore_prev_ucpe_install">
@@ -104,7 +104,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        <listitem>
          <para>The directory in which the archive has been unpacked will be
-          denoted as <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
+          denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
        </listitem>
        <listitem>
@@ -112,11 +112,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>)
          created during a previous Enea Edge Management Upgrade or Enea Edge
          Management Uninstall Operation into the
-          <literal>&lt;uCPEM-installdir&gt;</literal> directory.</para>
+          <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
        </listitem>
        <listitem>
-          <para>Enter <literal>&lt;uCPEM-installdir&gt;/dist</literal>.</para>
+          <para>Enter
+          <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
        </listitem>
        <listitem>
@@ -156,9 +157,15 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
      <orderedlist>
        <listitem>
-          <para>Navigate to the folder where the Enea Edge Management is
+          <para>Navigate to the folder where the Enea Edge Management
-          installed: <filename>&lt;uCPEM-installdir&gt;</filename>.</para>
+          application is unpacked:
+          <filename>&lt;uCPEM-installerdir&gt;</filename>.</para>
        </listitem>
+        
+        <listitem>
+          <para>Enter
+          <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+        </listitem>        
        <listitem>
          <para>Run the following command with the root user and change
@@ -186,7 +193,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
          <note>
            <para>The snapshot file created during the uninstall can be used
-            for restoring Enea Edge Management.</para>
+            for restoring the Enea Edge Management application.</para>
          </note>
        </listitem>
@@ -205,8 +212,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        </listitem>
      </itemizedlist>
-      <para>After these steps, the Enea Edge Management is completely removed
+      <para>After these steps, the Enea Edge Management application is
-      from the system.</para>
+      completely removed from the system.</para>
    </section>
  </section>
@@ -241,11 +248,12 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
      <note>
        <para>Upgrading from Enea NFV Access 2.3.0 is not possible when using
-        the Enea uCPE Manager in HTTPS mode. Either switch to HTTP by accessing
+        the Enea Edge Management application in HTTPS mode. Either switch to
-        <emphasis role="bold">System</emphasis>, <emphasis
+        HTTP by accessing the <emphasis role="bold">System</emphasis> menu,
-        role="bold">Configuration</emphasis>, <emphasis role="bold">Web
+        clicking on <emphasis role="bold">Configuration</emphasis>, then
-        Access</emphasis> and checking the <emphasis role="bold">Enable
+        <emphasis role="bold">Web Access</emphasis> and checking the <emphasis
-        HTTP</emphasis> box, or install Edge Enea 2.4.0 on the device manually.</para>
+        role="bold">Enable HTTP</emphasis> box, or by installing Edge Enea
+        2.4.0 on the device manually.</para>
      </note>
    </section>
@@ -379,8 +387,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
            when to run the upgrade.</para>
            <note>
-              <para>The hour represents the local Enea Edge Management server
+              <para>The hour represents the local Enea Edge Management
-              hour.</para>
+              application server hour.</para>
            </note>
          </listitem>
@@ -577,8 +585,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        Files</emphasis> tab by selecting the image file from the list and
        clicking the <emphasis role="bold">Install on Device</emphasis>
        button. The Image files that appear in the <emphasis role="bold">Image
-        Library</emphasis> tab can be uploaded to the Enea Edge Management Application
+        Library</emphasis> tab can be uploaded to the Enea Edge Management
-        by following the steps listed in <link linkend="image_lib">Image Library</link>.</para>
+        Application by following the steps listed in <link
+        linkend="image_lib">Image Library</link>.</para>
        <para>Once an image is installed on the uCPE device, the image will be
        available on the uCPE device and be visible in the <emphasis
@@ -588,16 +597,18 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        <itemizedlist>
          <listitem>
            <para>Select it from the list and then start the upgrade by
-            clicking the <emphasis role="bold">Upgrade</emphasis> button.</para>
+            clicking the <emphasis role="bold">Upgrade</emphasis>
+            button.</para>
          </listitem>
          <listitem>
-            <para>Select <emphasis role="bold">Operations</emphasis>, then 
+            <para>Select <emphasis role="bold">Operations</emphasis>, then
            <emphasis role="bold">Upgrade</emphasis>, enter the
            <literal>Release Name</literal> and press <emphasis
-            role="bold">Execute</emphasis>. Filling in the <literal>Restore Archive</literal> 
+            role="bold">Execute</emphasis>. Filling in the <literal>Restore
-            text field is optional and should be left unset if the 
+            Archive</literal> text field is optional and should be left unset
-              <literal>NFVi Snapshot</literal> feature is disabled.</para>
+            if the <literal>NFVi Snapshot</literal> feature is
+            disabled.</para>
          </listitem>
        </itemizedlist>
@@ -610,4 +621,4 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
      </section>
    </section>
  </section>
-</chapter>
+</chapter>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-getting-started/doc/vnf_mg.xml b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
index e3fcde2..058be40 100644
--- a/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="vnf_mg">
  <title>VNF Management</title>
-  <para>The Enea Edge Management is responsible for onboarding, configuring
+  <para>The Enea Edge Management application is responsible for onboarding,
-  (e.g. CloudInit) and ensuring life cycle management of VNFs that are
+  configuring (e.g. CloudInit) and ensuring life cycle management of VNFs that
-  instantiated and run on the various uCPE devices.</para>
+  are instantiated and run on various uCPE devices.</para>
  <section id="onboarding_a_vnf">
    <title>Onboarding a VNF</title>
    <para>The onboarding of a VNF means adding it to the Enea Edge Management
-    VNF Catalogue and preparing it for instantiation (deployment on connected
+    application VNF Catalogue and preparing it for instantiation (deployment
-    uCPE devices). This is accomplished using the Enea Edge Management
+    on connected uCPE devices). This is accomplished using the Enea Edge
-    Onboarding graphical user interface.</para>
+    Management Onboarding graphical user interface.</para>
    <para>Typically, the Getting Started Guide of a VNF, provided by the VNF
    vendor, contains all necessary information needed to onboard a VNF.</para>
@@ -36,7 +36,8 @@
            <para>There are no standard ways of managing VNF licenses,
            therefore no general guidelines can be provided. One example of
            license handling that can be employed in the Enea Edge Management
-            is the adding of a license during the Cloud-Init setup.</para>
+            application is the adding of a license during the Cloud-Init
+            setup.</para>
          </note>
        </listitem>
@@ -109,10 +110,10 @@
    </section>
    <section id="onboard_in_ucpemg">
-      <title>Onboarding into the Enea Edge Management</title>
+      <title>Onboarding into the Enea Edge Management application</title>
      <para><emphasis role="bold">How to onboard a VNF into the Enea Edge
-      Management </emphasis></para>
+      Management application</emphasis></para>
      <orderedlist>
        <listitem>
@@ -122,15 +123,15 @@
        </listitem>
        <listitem>
-          <para>Click the <emphasis role="bold">On-board</emphasis>
+          <para>Click the <emphasis role="bold">Onboard</emphasis>
          button.</para>
        </listitem>
      </orderedlist>
      <para>This window contains data fields where both necessary and optional
      information about the VNF can be supplied. After doing so, press the
-      Onboard button, the Enea Edge Management will create the VNF descriptor
+      Onboard button and the Enea Edge Management application will create the
-      and add it to its VNF Catalog.</para>
+      VNF descriptor and add it to its VNF Catalog.</para>
      <figure>
        <title>Onboard a VNF</title>
@@ -167,7 +168,7 @@
        <listitem>
          <para><emphasis role="bold">Description</emphasis>. This field
          contains any description provided and is only displayed in the GUI
-          tables in the Enea Edge Management.</para>
+          tables in the Enea Edge Management application.</para>
        </listitem>
        <listitem>
@@ -206,11 +207,12 @@
      configured, when creating an instance. Consult the VNF vendor to
      determine which and how many are required. Each interface requires a
      name, and optionally a description, used only by the Enea Edge
-      Management.</para>
+      Management application.</para>
      <note>
-        <para>CAUTION: The user MUST conserve the same order for the virtual
+        <para>CAUTION: The user MUST save and use the same order for the
-        interfaces during both onboarding and instantiation phases.</para>
+        virtual interfaces during both the onboarding and instantiation
+        phases.</para>
      </note>
      <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
@@ -242,7 +244,7 @@
            <listitem>
              <para><emphasis role="bold">NoCloud</emphasis>. This is a
-              simpler method that uses only one cloud init file
+              simpler method that uses only one cloud-init file
              (User-Data).</para>
            </listitem>
@@ -269,14 +271,14 @@
          <para>The <literal>Content Files Table</literal> is ONLY used if
          <literal>ConfigDrive</literal> is chosen as the Cloud-Init
          Datasource. For each content file added, a <literal>Path</literal>
-          must be provided. When the Enea Edge Management is used to create an
+          must be provided. When the Enea Edge Management application is used
-          instance for multiple VNFs, the user will be prompted to provide a
+          to create an instance for multiple VNFs, the user will be prompted
-          data file for each entry in this table. Each type of VNF will
+          to provide a data file for each entry in this table. Each type of
-          require different cloud-init files, e.g.: a license file. The data
+          VNF will require different cloud-init files, e.g.: a license file.
-          files will be added to the cloud-init image that the user provides
+          The data files will be added to the cloud-init image that the user
-          at the instantiation of the VNF. If the cloud-init image is not
+          provides at the instantiation of the VNF. If the cloud-init image is
-          provided, no Cloud-Init Data Source will be created for that VNF and
+          not provided, no Cloud-Init Data Source will be created for that VNF
-          there will be no warning.</para>
+          and there will be no warning.</para>
        </listitem>
      </orderedlist>
@@ -407,8 +409,9 @@
      </listitem>
    </orderedlist>
-    <para>Selecting the <emphasis role="bold">VNF</emphasis> menu then choosing <emphasis role="bold">Events</emphasis> 
+    <para>Selecting the <emphasis role="bold">VNF</emphasis> menu then
-        will show that the VNF was created and a connection was established.</para>
+    choosing <emphasis role="bold">Events</emphasis> will show that the VNF
+    was created and a connection was established.</para>
  </section>
  <section id="vm_operations">
@@ -430,7 +433,7 @@
      <listitem>
        <para>Depending on the desired action, click the <emphasis
        role="bold">Delete/ Force Delete / Start / Stop / Pause /
-        Resume</emphasis> button respectively.</para>
+        Resume</emphasis> button, respectively.</para>
      </listitem>
    </orderedlist>
@@ -443,15 +446,15 @@
      <listitem>
        <para>Depending on the desired action, choosing <emphasis
-        role="bold">Destroy / Start / Stop / Pause / Resume
+        role="bold">Destroy / Start / Stop / Pause / Resume VM</emphasis>
-        VM</emphasis> respectively.</para>
+        respectively.</para>
      </listitem>
      <listitem>
        <para>The <literal>Id</literal> of the VM that should be modified can
-        be found by selecting <emphasis role="bold">Configuration</emphasis>, then
+        be found by selecting <emphasis role="bold">Configuration</emphasis>,
-        <emphasis role="bold">Virtual Machines</emphasis>, and then accessing the <emphasis
+        then <emphasis role="bold">Virtual Machines</emphasis>, and then
-        role="bold">VMs</emphasis> tab.</para>
+        accessing the <emphasis role="bold">VMs</emphasis> tab.</para>
      </listitem>
      <listitem>
@@ -471,9 +474,9 @@
    <orderedlist>
      <listitem>
-        <para>SSH to the uCPE device from the Enea Edge Management (Access the
+        <para>SSH to the uCPE device from the Enea Edge Management application
-        <emphasis role="bold">Device</emphasis> menu and select <emphasis
+        (access the <emphasis role="bold">Device</emphasis> menu and select
-        role="bold">SSH</emphasis>) using:</para>
+        <emphasis role="bold">SSH</emphasis>) using:</para>
        <itemizedlist>
          <listitem>
@@ -484,13 +487,13 @@
          </listitem>
          <listitem>
-            <para>For reverse ssh connections (ssh to a uCPE device behind
+            <para>For reverse SSH connections (SSH to a uCPE device behind
            NAT): the <literal>Username</literal> (default: root) and the
-            <literal>Reverse ssh</literal> checkbox checked. The port will be
+            <literal>Reverse SSH</literal> checkbox checked. The port will be
-            automatically chosen by the Enea Edge Management in the range
+            automatically chosen by the Enea Edge Management application in
-            defined in the <emphasis role="bold">SSH</emphasis> configuration
+            the range defined in the <emphasis role="bold">SSH</emphasis>
-            panel, available when accessing <emphasis
+            configuration panel, available when accessing the <emphasis
-            role="bold">System</emphasis>, then <emphasis
+            role="bold">System</emphasis> menu, then <emphasis
            role="bold">Configuration</emphasis> and choosing <emphasis
            role="bold">Reverse SSH</emphasis> . By default, the start port
            will be <literal>7000</literal> and the maximum number of ports
@@ -523,4 +526,4 @@
      </listitem>
    </orderedlist>
  </section>
-</chapter>
+</chapter>
+\ No newline at end of file
diff --git a/doc/book-enea-edge-management-open-source/doc/about.xml b/doc/book-enea-edge-management-open-source/doc/about.xml
index 758efc9..e13cd41 100644
--- a/doc/book-enea-edge-management-open-source/doc/about.xml
+++ b/doc/book-enea-edge-management-open-source/doc/about.xml
@@ -5,8 +5,8 @@
  <title>About this Report</title>
  <para>This document contains the open source and license information
-  pertaining to packages relating to the Enea Edge Management provided 
+  pertaining to packages relating to the Enea Edge Management application
-    with Enea Edge <xi:include
+  provided with Enea Edge <xi:include
  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
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 766c02a..349c955 100644
--- a/doc/book-enea-edge-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -4,26 +4,28 @@
 <chapter id="relinfo-about-release">
  <title>About This Release</title>
-  <para>Enea Edge is a complete NFVI software platform designed for deployment
+  <para>Enea Edge is a complete Virtualization Infrastructure software
-  on any white box uCPE device, and optimized for common use cases. Enea Edge
+  platform designed for deployment on any white box uCPE device, and optimized
-  includes both the Enea Edge Runtime deployed on a white box, and a
+  for common use-cases. It includes the Enea Edge Runtime deployed
-  management component with automation tools deployed in a private or public
+  on a white box, the Enea Edge Management application and the Enea Edge 
-  cloud.</para>
+    Automation, management and automation tools deployed in a 
+    private or public cloud.</para>
  <para>The Enea Edge <xi:include
  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes a new version of
+  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes new features, 
-  the major components as well as other features and optimizations, and
+    optimizations, corrections, and updates to the user documentation.. 
-  documentation updates. A list of new features and improvements can be found
+    A list of major new features and improvements can be found in  
-  in <xref linkend="relinfo-changes-other">Section 2.1 New Features and
+    <xref linkend="relinfo-changes-other">Section 2.1 New Features and Improvements</xref>.</para>
-  Improvements</xref>.</para>
+  
  <section id="release-content">
    <title>Enea Edge Release Content</title>
    <para>The release content is detailed below:</para>
+    <para>Main Components</para>
    <itemizedlist>
      <listitem>
        <para>Enea_Edge_Runtime_C3000_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
@@ -42,17 +44,21 @@
      </listitem>
      <listitem>
-        <para>Enea_Edge_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</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>
+    <para>Example Deployments:</para>
+    <itemizedlist>
      <listitem>
-        <para>VNF_example_configurations.tar.gz</para>
+        <para>Enea_Edge_Telemetry_Deploy_&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
+        <para>VNF_example_configurations.tar.gz</para>
-        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
-        Features and Improvements</xref>.)</para>
      </listitem>
    </itemizedlist>
@@ -135,17 +141,17 @@
        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
        xmlns:xi="http://www.w3.org/2001/XInclude"
        xpointer="element(book_enea_edge_automation_user_guide/1)" />.
-        Describes the Enea Edge Automation and provides instructions regarding 
+        Describes the Enea Edge Automation and provides instructions regarding
-          the necessary steps to configure and run the tool.</para>
+        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 
+        Describes the Automation Framework and Test Harness for Enea Edge
-          (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 
+        (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New
-          New Features and Improvements</xref>).</para>
+        Features and Improvements</xref>).</para>
      </listitem>
      <listitem>
@@ -167,15 +173,15 @@
    <itemizedlist>
      <listitem>
-        <para>Google Chrome (tested with version 86).</para>
+        <para>Google Chrome (tested with version 89).</para>
      </listitem>
      <listitem>
-        <para>Mozilla Firefox (tested with version 82).</para>
+        <para>Mozilla Firefox (tested with version 87).</para>
      </listitem>
      <listitem>
-        <para>Microsoft Edge (tested with version 84).</para>
+        <para>Microsoft Edge (tested with version 89).</para>
      </listitem>
    </itemizedlist>
  </section>
diff --git a/doc/book-enea-edge-release-info/doc/book.xml b/doc/book-enea-edge-release-info/doc/book.xml
index b886ee1..0b77f41 100644
--- a/doc/book-enea-edge-release-info/doc/book.xml
+++ b/doc/book-enea-edge-release-info/doc/book.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
@@ -7,9 +7,10 @@
  <title><trademark class="registered">Enea</trademark> Edge Release
  Information</title>
-  <subtitle>Release Version
+  <subtitle>Release Version <xi:include
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
-         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
  <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
@@ -27,4 +28,4 @@
  <xi:include href="../../s_docbuild/template/docsrc_common/contacting_enea_nfva.xml"
              xmlns:xi="http://www.w3.org/2001/XInclude" />
-</book>
+</book>
+\ 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 4f3eb7a..0fdb9aa 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
@@ -20,14 +20,20 @@
    <listitem>
      <para><remark>ELCCR-527</remark>Cancelling a file upload in the Enea
-      Edge Management will require the user to close and reopen the upload window
+      Edge Management will require the user to close and reopen the upload
-      for the next upload to work.</para>
+      window for the next upload to work.</para>
    </listitem>
    <listitem>
-      <para><remark>ELCCR-577</remark>If Enea Edge Management is restored from a backup
+      <para><remark>ELCCR-577</remark>If the Enea Edge Management application
-      made on a release version older than Enea NFV Access 2.2.3, VNFs cannot be instantiated
+      is restored from a backup made on a release version older than Enea NFV
-      from the GUI.</para>
+      Access 2.2.3, VNFs cannot be instantiated from the GUI.</para>
+    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1134</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>
@@ -45,7 +51,8 @@
    <listitem>
      <para><remark>ELCCR-847</remark>The Juniper vSRX VNF cannot be
      instantiated on the Xeon-D architectures due to missing CPU features in
-      the VNF's domain XML. This impacts all example use cases where the Juniper VNF is used.</para>
+      the VNF's domain XML. This impacts all example use cases where the
+      Juniper VNF is used.</para>
    </listitem>
    <listitem>
@@ -60,64 +67,53 @@
      to be connected to a network with at least a router/gateway installed
      for next-hop communication.</para>
    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1504</remark>To change the type of an interface 
+        from DPDK to SR-IOV, first delete the existing interface, then 
+        recreate it with the desired type.</para>
+    </listitem>
    <listitem>
      <para><remark>LXCR-9992</remark>Depending on hardware capabilities,
      there are certain limitations regarding the <literal>vfio-pci</literal>
-      and <literal>igb_uio</literal> drivers. While the Enea Edge
+      and <literal>igb_uio</literal> drivers. While the Enea Edge Runtime uses
-      Runtime uses the <literal>vfio-pci</literal> driver by default,
+      the <literal>vfio-pci</literal> driver by default, for certain hardware
-      for certain hardware configurations, <literal>igb_uio</literal> should
+      configurations, <literal>igb_uio</literal> should be used instead, by
-      be used instead, by providing custom scripting. Please contact Enea for
+      providing custom scripting. Please contact Enea for further
-      further details.</para>
+      details.</para>
    </listitem>
    <listitem>
-      <para><remark>STCR-6224</remark>The Enea Edge Automation
+      <para><remark>STCR-6224</remark>The Enea Edge Automation and the Enea
-      and the Enea Edge Automation Framework and Test Harness do not
+      Edge Automation Framework and Test Harness do not support multiple
-      support multiple custom scripts uploaded to a uCPE device at the same
+      custom scripts uploaded to a uCPE device at the same time.</para>
-      time.</para>
    </listitem>
    <listitem>
      <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
-      implemented in the Enea Edge Automation Framework and Test Harness.</para>
+      implemented in the Enea Edge Automation Framework and Test
-    </listitem>
+      Harness.</para>
-    <listitem>
-      <para><remark>USERDOCAP-628</remark>Enea Edge Automation Framework
-      and Test Harness does not have support for product features implemented
-      in Enea Edge 2.4.0 or newer.</para>
    </listitem>
    <listitem>
-      <para><remark>ELCCR-912</remark>When the Enea Edge Management is installed
+      <para><remark>USERDOCAP-628</remark>Enea Edge Automation Framework and
-      on CentOS 7, prior to C7.1804 (kernel version 3.10.0-862), adding an
+      Test Harness does not have support for product features implemented in
-      upgrade image fails. As a workaround, please update
+      Enea Edge 2.4.0 or newer.</para>
-      <literal>glib2</literal> to version 2.54.2 or later, using <literal>#yum
-      update glib2</literal>.</para>
    </listitem>
    <listitem>
-      <para><remark>ELCCR-854</remark>Changing the management interface IP
+      <para><remark>ELCCR-912</remark>When the Enea Edge Management
-      address will result in a temporary loss of connection with the uCPE
+      application is installed on CentOS 7, prior to C7.1804 (kernel version
-      device. If the device is behind a NAT, while using the Call Home
+      3.10.0-862), adding an upgrade image fails. As a workaround, please
-      connection, reestablishing the connection automatically could take up to
+      update <literal>glib2</literal> to version 2.54.2 or later, using
-      20 minutes. Restarting the vCPE Overlay will immediately reestablish the
+      <literal>#yum update glib2</literal>.</para>
-      connection, but that implies the existence of an alternate way to
-      trigger the vCPE restart operation on the device.</para>
    </listitem>
    <listitem>
-      <para><remark>USERDOCAP-641</remark>Enea Edge does not have
+      <para><remark>USERDOCAP-641</remark>Enea Edge does not have support for
-      support for IPv6 addresses on both uCPE devices and the Enea Edge
+      IPv6 addresses on both uCPE devices and the Enea Edge Management
-      Management installation.</para>
+      installation.</para>
-    </listitem>
-    <listitem>
-      <para><remark>ELCCR-1428</remark>Wireless AP creation through the REST
-      API does not validate that the wireless interface and LAN bridge are
-      configured. Using these parameters may result in undefined
-      behavior.</para>
    </listitem>
    <listitem>
@@ -128,6 +124,11 @@
    </listitem>
    <listitem>
+      <para><remark>ELCCR-1518</remark>The Wireless AP's wpa2psk password
+      should not contain white space characters.</para>
+    </listitem>
+    <listitem>
      <para><remark>ELCCR-1351</remark>The updated
      <filename>.Keystore</filename> and <filename>server.xml</filename> files
      from the
@@ -142,10 +143,10 @@
    <listitem>
      <para><remark>ELCCR-1371</remark>The current self-signed certificate for
-      the Enea Edge Management is generated at build time, with a hard-coded
+      the Enea Edge Management application is generated at build time, with a
-      common-name causing the uCPE device upgrade to fail in HTTPS mode. As a
+      hard-coded common-name causing the uCPE device upgrade to fail in HTTPS
-      workaround, another certificate (containing an IP based common-name)
+      mode. As a workaround, another certificate (containing an IP based
-      must be generated.</para>
+      common-name) must be generated.</para>
      <para>Perform the following the steps to generate the
      certificate:</para>
@@ -165,8 +166,8 @@
        </listitem>
        <listitem>
-          <para>Start the Enea Edge Management, the new certificate should now
+          <para>Start the Enea Edge Management application, the new
-          take effect.</para>
+          certificate should now take effect.</para>
        </listitem>
      </orderedlist>
    </listitem>
@@ -177,14 +178,24 @@
      to delete the old interfaces and recreate them with the desired
      type.</para>
    </listitem>
+    
+    <listitem>
+      <para><remark>ELCCR-1497</remark>If the Enea Edge Management application 
+        has an incorrect database configuration, when performing an uninstallation, 
+        the Tomcat instance and Watchdog service will not be stopped automatically. 
+        Instead, they must be killed explicitly.</para>
+    </listitem>
+    
    <listitem>
-      <para><remark>ELCCR-907</remark>At times the VIP address is not acquired
+      <para><remark>ELCCR-1468</remark>When using the Enea Edge Management
-      by any of the backup nodes if a power failure happens on primary node in
+      application in HTTPS mode, upgrading a device from NFV Access 2.3.0 is
-      a High Availability setup. To recover, follow the official documentation
+      not possible. Either switch to HTTP mode (for more details see <olink
-      available at <ulink
+      targetdoc="book_enea_edge_getting_started"
-      url="https://mariadb.com/kb/en/galera-cluster-recovery/">Galera Cluster
+      targetptr="device_up_process">The uCPE device Upgrade Process in the
-      Recovery</ulink>.</para>
+      <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)
+      or install it manually.</para>
    </listitem>
    <listitem condition="hidden">
@@ -196,18 +207,6 @@
      in an external PDF reader. As a workaround, open the HTML version of the
      document.</para>
    </listitem>
-    <listitem>
-      <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_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_edge_getting_started/1)" /></olink>
-      Manual) or install it manually.</para>
-    </listitem>
  </itemizedlist>
  <!-- The file with a section below is autocreated by make init  -->
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 63c2216..aafb31c 100644
--- a/doc/book-enea-edge-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -16,35 +16,59 @@
    <itemizedlist>
      <listitem>
        <para><remark>CPDX-3496</remark>Embedded WiFi support for all-in-one
-        store/home office deployment.</para>
+        store/home office deployment. For more details please see the <olink
+        targetdoc="book_enea_edge_getting_started"
+        targetptr="wap_interface_type">Wap Interface Type 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><remark>CPDX-3499</remark>Expanded hardware, OS and network
-        monitoring capability with Grafana integration.</para>
+        monitoring capability with Grafana integration. For more details
+        please see <olink targetdoc="book_enea_edge_getting_started"
+        targetptr="grafana">Using Grafana and InfluxDB 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><remark>CPDX-3407</remark>HTTPS based downloads of VNFs for
-        simplified deployment of the Enea Edge Management in cloud
+        simplified deployment of the Enea Edge Management application in cloud
-        environments.</para>
+        environments. For more details please see <olink
+        targetdoc="book_enea_edge_getting_started"
+        targetptr="fresh_ucpemg_install">Fresh Installation of the Enea uCPE
+        Manager 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><remark>CPDX-3500</remark>The Enea Edge Automation, a tool for
+        <para><remark>CPDX-3500</remark>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>
+        in the next major release. For more details please see the <ns: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"
+        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /> and the
+        xpointer="element(book_enea_edge_automation_user_guide/1)" />.</para>
-        <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
+        <note>
-        xpointer="element(book_enea_edge_system_test_specification/1)" /> are
+          <para>The Enea Edge Automation Framework and Test Harness, and its
-        deprecated starting with Enea Edge 2.4.0.</para>
+          related documentation the <ns:include
+          href="../../s_docbuild/olinkdb/pardoc-common.xml"
+          xmlns:ns="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_edge_auto_fw_th_user_guide/1)" /> and
+          the <ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+          xmlns:ns="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_edge_system_test_specification/1)" />
+          are deprecated starting with Enea Edge 2.4.0.</para>
+        </note>
      </listitem>
    </itemizedlist>
@@ -87,22 +111,22 @@
      </listitem>
      <listitem>
-        <para>Platform and VNF Snapshots (made originally available starting 
+        <para>Platform and VNF Snapshots (made originally available starting
-          with Enea NFV Access 2.3.0).</para>
+        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
+        snapshots of the Enea Edge Runtime configuration, with the purpose of
-            of recovering after a failed reconfiguration. This feature is
+        recovering after a failed reconfiguration. This feature is disabled by
-            disabled by default.</para>
+        default.</para>
-            <para>VNF Snapshots allow users to store, manage and restore
+        <para>VNF Snapshots allow users to store, manage and restore snapshots
-            snapshots of VNFs deployed on the Enea Edge Runtime, with the
+        of VNFs deployed on the Enea Edge Runtime, with the purpose of
-            purpose of restoring the VNF after a persistent VNF failure. This
+        restoring the VNF after a persistent VNF failure. This feature is
-            feature is disabled by default.</para>
+        disabled by default.</para>
        <note>
-          <para>Users that would like to try out the Snapshot features should
+          <para>Users that would like to try out the Early Access features
-          contact Enea Support for additional documentation and
+          should contact Enea Support for additional documentation and
          assistance.</para>
        </note>
      </listitem>
diff --git a/doc/docsrc_common/pardoc-distro.xml b/doc/docsrc_common/pardoc-distro.xml
index fce0543..b6bc8bb 100644
--- a/doc/docsrc_common/pardoc-distro.xml
+++ b/doc/docsrc_common/pardoc-distro.xml
@@ -1,31 +1,57 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- Declarations to inherit by xi:include
 ========================================== -->
 <section id="pardoc_names">
-  <title>Enea NFV Access DocBook XML Based UserDoc Names and Parameters</title>
+  <title>Enea NFV Access DocBook XML Based UserDoc Names and
+  Parameters</title>
-  <para>NOTE: DO NOT EDIT THIS FILE IN xmlmind but you can open it to see any errors, don't save!!!!</para>
+  <para>NOTE: DO NOT EDIT THIS FILE IN xmlmind but you can open it to see any
+  errors, don't save!!!</para>
  <para>NOTE: Use xi:include to include parameters into a docbook XML file.
-        Note: Only full elements can be included and the included element must
+  Note: Only full elements can be included and the included element must be
-        be allowed in that place. Example: For ulink, entire ulink elements
+  allowed in that place. Example: For ulink, entire ulink elements must be
-        must be included, not just parts of them.</para>
+  included, not just parts of them.</para>
  <para>**** The phrase elements below can be used as variables in several
-             places in XML files and/or in make script files ****</para>
+  places in XML files and/or in make script files ****</para>
+  <!-- Distribution and release -->
-<!-- Distribution and release -->
+  <!--
-<!--
    The parameter 'prev_baseline' is intentionally undefined here since this
    is the first release of the networking profile. The line must be removed.
 -->
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-open-source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>doc/book-enea-nfv-access-open-source/doc/licenses.xml</phrase></para>
+  <para
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-openstack-open-source/doc/licenses.xml</phrase></para>
+  id="prev_lic_file"><phrase>doc/book_enea_edge_runtime_open_source/doc/licenses.xml</phrase></para>
-<para id="new_lic_file"><phrase>book-enea-nfv-access-openstack-open-source/doc/licenses.xml</phrase></para>
-<para id="prev_lic_file"><phrase>doc/book-enea-nfv-access-dev-open-source/doc/licenses.xml</phrase></para>
+  <para
-<para id="new_lic_file"><phrase>doc/book-enea-nfv-access-dev-open-source/doc/licenses.xml</phrase></para>
+  id="new_lic_file"><phrase>doc/book_enea_edge_runtime_open_source/doc/licenses.xml</phrase></para>
-</section>
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_management_open_source/doc/licenses.xml</phrase></para>
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_management_open_source/doc/licenses.xml</phrase></para>
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_telemetry_open_source/licenses.xml</phrase></para>
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_telemetry_open_source/doc/licenses.xml</phrase></para>
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_automation_open_source/licenses.xml</phrase></para>
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_automation_open_source/doc/licenses.xml</phrase></para>
+  <para
+  id="prev_lic_file"><phrase>doc/book_enea_edge_auto_fw_th_open_source/licenses.xml</phrase></para>
+  <para
+  id="new_lic_file"><phrase>doc/book_enea_edge_auto_fw_th_open_source/doc/licenses.xml</phrase></para>
+</section>
+\ No newline at end of file