Updated the version variable for Enea Edge,

Added in the versioning files ie all eltf updates files, 3 in total,
Updated the EE Automation User Guide to reflect the new name,
along with various edits and tweaks,
Removed obsolete files from the Enea Edge Rel notes repo,
Tweaked the AF User Guide 4.3.2 chapter.

Change-Id: Ie08fab45236602e6875ba5f7d2724c0cd7306860
Signed-off-by: mrpa <miruna.paun@enea.com>

30 files changed, 1633 insertions, 990 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 1f5b506..5c1a6b9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,8 +32,8 @@ include init.mk
 
 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
+ELTF_PARAMS_TEMPLATE := eltf_params_template.xml
+ELTF_PARAMS_UPDATED  := eltf_params_updated.xml
 
 
 
@@ -184,7 +184,7 @@ endif
 
 books: init
 # BOOKPACKAGES is defined in all book-*/swcomp.mk
-        $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
+        $(VERB)DISTRO_VERSION=`egrep '"EneaEdge_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
                BOOKVER="Enea Edge-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \
          for book in $(BOOKPACKAGES); do \
           for format in $(FORMAT); do \
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
index 24f674d..53cda06 100644
--- a/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
@@ -7,8 +7,8 @@
   <para>This document contains the open source and license information
   pertaining to the Enea Edge Automation Framework and Test Harness provided with
   Enea Edge <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+  xpointer="element(EneaEdge_REL_VER/1)" />.</para>
   
 </chapter>
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
index df5e029..960e0cc 100644
--- a/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
@@ -7,7 +7,7 @@
   <title><trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness Open Source Report</title>
   
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
                  
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
index 397e2b8..07902ad 100644
--- a/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
@@ -36,9 +36,9 @@
             <entry>Enea Edge Automation Framework and Test Harness</entry>
 
             <entry><xi:include
-            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+            href="../../eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
+            xpointer="element(EneaEdge_REL_VER/1)" /></entry>
 
             <entry>Configuration and Automation Framework for the Enea Edge Management
             GUI.</entry>
@@ -50,9 +50,9 @@
             <entry>Enea Edge Automation Framework and Test Harness</entry>
 
             <entry><xi:include
-            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+            href="../../eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
+            xpointer="element(EneaEdge_REL_VER/1)" /></entry>
 
             <entry>Configuration and Automation Framework for the Enea Edge Management
             GUI.</entry>
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 d533a74..3a0c698 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
@@ -8,9 +8,9 @@
   Framework and Test Harness User Guide</title>
 
   <subtitle>Release Version <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+  xpointer="element(EneaEdge_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
diff --git a/doc/book-enea-edge-automation-open-source/doc/about.xml b/doc/book-enea-edge-automation-open-source/doc/about.xml
index 50ce933..64a6616 100644
--- a/doc/book-enea-edge-automation-open-source/doc/about.xml
+++ b/doc/book-enea-edge-automation-open-source/doc/about.xml
@@ -7,8 +7,8 @@
   <para>This document contains the open source and license information
   pertaining to the Enea Edge Automation provided with
   Enea Edge <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+  xpointer="element(EneaEdge_REL_VER/1)" />.</para>
   
 </chapter>
diff --git a/doc/book-enea-edge-automation-open-source/doc/book.xml b/doc/book-enea-edge-automation-open-source/doc/book.xml
index 317c87d..79da1aa 100644
--- a/doc/book-enea-edge-automation-open-source/doc/book.xml
+++ b/doc/book-enea-edge-automation-open-source/doc/book.xml
@@ -7,7 +7,7 @@
   <title><trademark class="registered">Enea</trademark> Edge Automation Open Source Report</title>
   
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
                  
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-edge-automation-open-source/doc/licenses.xml b/doc/book-enea-edge-automation-open-source/doc/licenses.xml
index e2ade8a..01d0c08 100644
--- a/doc/book-enea-edge-automation-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-automation-open-source/doc/licenses.xml
@@ -36,9 +36,9 @@
             <entry>Enea Edge Automation</entry>
 
             <entry><xi:include
-            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+            href="../../eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
+            xpointer="element(EneaEdge_REL_VER/1)" /></entry>
 
             <entry>Configuration and Automation for the Enea Edge Management
             GUI.</entry>
@@ -50,9 +50,9 @@
             <entry>Enea Edge Automation</entry>
 
             <entry><xi:include
-            href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+            href="../../eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(EneaLinux_REL_VER/1)" /></entry>
+            xpointer="element(EneaEdge_REL_VER/1)" /></entry>
 
             <entry>Configuration and Automation for the Enea Edge Management
             GUI.</entry>
diff --git a/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
index bc974cc..c1b554e 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/automation_framework_test_harness.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <chapter id="auto_fw_test_harness">
   <title>Enea Edge Automation</title>
 
   <section id="AFTH_structure">
     <title>File Structure</title>
 
-    <para>Enea Edge Automation is an open-source product,
-    with the following directory structure:</para>
-        
-        <itemizedlist spacing="compact">
-        <listitem>
-          <para>ansible.cfg</para>
-        </listitem>
+    <para>Enea Edge Automation is an open-source product, with the following
+    directory structure:</para>
 
-        <listitem>
-          <para>automation_framework</para>
-        </listitem>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>ansible.cfg</para>
+      </listitem>
 
-        <listitem>
-          <para>CHANGELOG</para>
-        </listitem>
+      <listitem>
+        <para>automation_framework</para>
+      </listitem>
 
-        <listitem>
-          <para>environment_variables.sh</para>
-        </listitem>
+      <listitem>
+        <para>CHANGELOG</para>
+      </listitem>
 
-        <listitem>
-          <para>modules</para>
-        </listitem>
+      <listitem>
+        <para>environment_variables.sh</para>
+      </listitem>
 
-        <listitem>
-          <para>setup_env_requirements.txt</para>
-        </listitem>
+      <listitem>
+        <para>modules</para>
+      </listitem>
 
-        <listitem>
-          <para>setup_env.sh</para>
-        </listitem>
+      <listitem>
+        <para>setup_env_requirements.txt</para>
+      </listitem>
 
-        <listitem>
-          <para>test_harness</para>
-        </listitem>
+      <listitem>
+        <para>setup_env.sh</para>
+      </listitem>
 
-        <listitem>
-          <para>unit_tests</para>
-        </listitem>
+      <listitem>
+        <para>test_harness</para>
+      </listitem>
 
-        <listitem>
-          <para>VERSION</para>
-        </listitem>
-      </itemizedlist>
+      <listitem>
+        <para>unit_tests</para>
+      </listitem>
+
+      <listitem>
+        <para>VERSION</para>
+      </listitem>
+    </itemizedlist>
 
     <para>Each file/directory is described in more details in the following
     sections.</para>
@@ -58,70 +58,72 @@
 
       <para>The <filename>setup_env.sh</filename>,
       <filename>setup_env_requirements.txt</filename> and
-      <filename>environment_variables.sh</filename> files are used to create the
-      testing virtual environment, using the following
+      <filename>environment_variables.sh</filename> files are used to create
+      the testing virtual environment, using the following
       prerequisites:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para>The environment variable</para>
-          </listitem>
 
-          <listitem>
-            <para>Python packages</para>
-          </listitem>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>The environment variable</para>
+        </listitem>
 
-          <listitem>
-            <para>Ansible package(s)</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para>Python packages</para>
+        </listitem>
 
-      <para>Where the <filename>environment_variables.sh</filename> script sets the
-      environment variables. The <filename>setup_env_requirements.txt</filename> contains the
-      mapping between the package name and its version, and the <filename>setup_env.sh</filename> 
-          script creates a testing virtual environment.</para>
+        <listitem>
+          <para>Ansible package(s)</para>
+        </listitem>
+      </itemizedlist>
 
-      <para>The <filename>setup_env.sh</filename> does the
-      following:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para>Checks if the <literal>Python 3</literal> and
-            <literal>pip</literal> packages are installed on the host. If at
-            least one package is not installed on the host, then an error is
-            displayed and the script stops.</para>
-          </listitem>
+      <para>Where the <filename>environment_variables.sh</filename> script
+      sets the environment variables. The
+      <filename>setup_env_requirements.txt</filename> contains the mapping
+      between the package name and its version, and the
+      <filename>setup_env.sh</filename> script creates a testing virtual
+      environment.</para>
 
-          <listitem>
-            <para>Creates and activates the <literal>testHarness-venv</literal>
-            virtual environment.</para>
-          </listitem>
+      <para>The <filename>setup_env.sh</filename> does the following:</para>
 
-          <listitem>
-            <para>Upgrades the <literal>pip</literal> package to the newest
-            version.</para>
-          </listitem>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>Checks if the <literal>Python 3</literal> and
+          <literal>pip</literal> packages are installed on the host. If at
+          least one package is not installed on the host, then an error is
+          displayed and the script stops.</para>
+        </listitem>
 
-          <listitem>
-            <para>Installs the packages defined in
-            <filename>setup_env_requirements.txt</filename> on the virtual
-            environment.</para>
-          </listitem>
+        <listitem>
+          <para>Creates and activates the <literal>testHarness-venv</literal>
+          virtual environment.</para>
+        </listitem>
 
-          <listitem>
-            <para>Sets the environment variables defined in
-            <filename>environment_variables.sh</filename> on the virtual
-            environment.</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para>Upgrades the <literal>pip</literal> package to the newest
+          version.</para>
+        </listitem>
+
+        <listitem>
+          <para>Installs the packages defined in
+          <filename>setup_env_requirements.txt</filename> on the virtual
+          environment.</para>
+        </listitem>
+
+        <listitem>
+          <para>Sets the environment variables defined in
+          <filename>environment_variables.sh</filename> on the virtual
+          environment.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
-    <section id ="version_changelog">
+    <section id="version_changelog">
       <title>VERSION and CHANGELOG</title>
 
-      <para>The <filename>VERSION</filename> and <filename>CHANGELOG</filename> files
-      contain information about the version, build number, and all the notable
-      changes added in the Enea Edge Automation.</para>
+      <para>The <filename>VERSION</filename> and
+      <filename>CHANGELOG</filename> files contain information about the
+      version, build number, and all the notable changes added in the Enea
+      Edge Automation.</para>
     </section>
 
     <section id="module_enea_dir">
@@ -129,26 +131,26 @@
 
       <para>The <literal>modules/enea</literal> directory contains the
       following:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para><literal>config</literal> - contains the configuration files
-            that need to be updated in order to successfully run the
-            Enea Edge Automation. For more details, see <xref
-            linkend="AFTH_cofig" />.</para>
-          </listitem>
 
-          <listitem>
-            <para><literal>scenario</literal> - contains the test scenarios.
-            The test scenarios include custom script examples, service
-            chaining VNF examples and so on.</para>
-          </listitem>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para><literal>config</literal> - contains the configuration files
+          that need to be updated in order to successfully run the Enea Edge
+          Automation. For more details, see <xref
+          linkend="AFTH_cofig" />.</para>
+        </listitem>
 
-          <listitem>
-            <para><literal>VNF_images</literal> - contains the VNF images that
-            are used in test scenarios.</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para><literal>scenario</literal> - contains the test scenarios. The
+          test scenarios include custom script examples, service chaining VNF
+          examples and so on.</para>
+        </listitem>
+
+        <listitem>
+          <para><literal>VNF_images</literal> - contains the VNF images that
+          are used in test scenarios.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section id="automation_framework_dir">
@@ -156,55 +158,67 @@
 
       <para>The <literal>automation_framework</literal> directory includes all
       the Python scripts used by the Automation Framework. Each Python script
-      implements a class that defines a functionality of the Enea Edge Management application.</para>
+      implements a class that defines a functionality of the Enea Edge
+      Management application.</para>
 
       <para>The Python scripts can be split into the following:</para>
-          
-          <itemizedlist>
-          <listitem>
-            <para>The <filename>uCPEMgrHTTPClientRestAPIv2.py</filename> script,
-            where the <literal>uCPEMgrHTTPClient</literal> class is defined. This
-            class communicates with the Enea Edge Management application via REST API.</para>
-          </listitem>
 
-          <listitem>
-            <para>Other Python scripts, where the classes for the Enea Edge Management
-            module are defined. Each class inherits the 
-            <literal>uCPEMgrHTTPClientRestAPIv2</literal> class and uses its
-            methods to communicate with the Enea Edge Management application via the REST API. Each class
-            corresponds to an Enea Edge Management module.</para>
-
-            <para><emphasis role="bold">Example</emphasis>: the 
-            <filename>OfflineConfigHandler.py</filename> script, where the 
-            <literal>OfflineConfigHandler</literal> class is defined. Inside
-            this class, the methods for offline configuration functionality
-            are implemented: <literal>addOfflineConfig</literal>,
-            <literal>removeOfflineConfig</literal>,
-            <literal>uploaOfflineConfig</literal> and so on.</para>
-          </listitem>
-        </itemizedlist>
+      <itemizedlist>
+        <listitem>
+          <para>The <filename>ManagementHTTPClientRestAPIv2.py</filename>
+          script, where the <literal>ManagementClient</literal> class is
+          defined. This class communicates with the Enea Edge Management
+          application via REST API.</para>
+
+          <note>
+            <para>The <filename>uCPEMgrHTTPClientRestAPIv2.py</filename>
+            script is where the <literal>uCPEMgrHTTPClient</literal> class is
+            defined. The <literal>uCPEMgrHTTPClient</literal> class is a
+            wrapper of the <literal>ManagementClient</literal> class. This
+            script is deprecated and will be removed starting with the next
+            major release.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Other Python scripts, where the classes for the Enea Edge
+          Management module are defined. Each class inherits the
+          <literal>ManagementClient</literal> class and uses its methods to
+          communicate with the Enea Edge Management application via the REST
+          API. Each class corresponds to an Enea Edge Management
+          module.</para>
+
+          <para><emphasis role="bold">Example</emphasis>: the
+          <filename>OfflineConfigHandler.py</filename> script, where the
+          <literal>OfflineConfigHandler</literal> class is defined. Inside
+          this class, the methods for offline configuration functionality are
+          implemented: <literal>addOfflineConfig</literal>,
+          <literal>removeOfflineConfig</literal>,
+          <literal>uploaOfflineConfig</literal> and so on.</para>
+        </listitem>
+      </itemizedlist>
     </section>
 
     <section id="unit_test_dir">
       <title>The unit_test directory</title>
 
       <para>The <literal>unit_test</literal> directory contains:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para>JSON files for complex scenarios with multiple
-            operations.</para>
-          </listitem>
 
-          <listitem>
-            <para>The Python <literal>unit-test</literal> class.</para>
-          </listitem>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>JSON files for complex scenarios with multiple
+          operations.</para>
+        </listitem>
 
-          <listitem>
-            <para>Loader scripts for generating specific test cases for the
-            available Python script.</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para>The Python <literal>unit-test</literal> class.</para>
+        </listitem>
+
+        <listitem>
+          <para>Loader scripts for generating specific test cases for the
+          available Python script.</para>
+        </listitem>
+      </itemizedlist>
 
       <para>The generated test cases are injected into the Python
       <literal>unit-test</literal> suite class to run using the Python
@@ -222,11 +236,12 @@
 
       <para>The <literal>test_harness</literal> directory contains all the
       implemented playbooks. This directory is structured in multiple
-      subdirectories, each subdirectory represents a functionality of the Enea Edge Management application. Each implemented playbook from this directory runs a method
-      from a Python class from the <literal>automation_framework</literal>
-      directory. Each playbook is an atomic operation, a basic operation that
-      need to be tested. These playbooks are used in complex test
-      scenarios.</para>
+      subdirectories, each subdirectory represents a functionality of the Enea
+      Edge Management application. Each implemented playbook from this
+      directory runs a method from a Python class from the
+      <literal>automation_framework</literal> directory. Each playbook is an
+      atomic operation, a basic operation that need to be tested. These
+      playbooks are used in complex test scenarios.</para>
     </section>
 
     <section id="log_dir">
@@ -234,64 +249,67 @@
 
       <para>The <literal>log</literal> directory is added in the directory
       structure by the <filename>setup_env.sh</filename> script. The
-      <filename>setup_env.sh</filename> script stores the output logs in the 
-      <filename>setup_env.log</filename> file. The Ansible playbooks store the logs
-      in the <filename>ansible.log</filename> file. The Python scripts store the logs in
-      the <filename>debug.log</filename> file.</para>
+      <filename>setup_env.sh</filename> script stores the output logs in the
+      <filename>setup_env.log</filename> file. The Ansible playbooks store the
+      logs in the <filename>ansible.log</filename> file. The Python scripts
+      store the logs in the <filename>debug.log</filename> file.</para>
     </section>
   </section>
 
   <section id="AFTH_cofig">
     <title>Configuring the System</title>
 
-    <para>The configuration files must be updated before using Enea Edge Automation. 
-    They are stored in the <literal>modules/enea/config</literal>
+    <para>The configuration files must be updated before using Enea Edge
+    Automation. They are stored in the <literal>modules/enea/config</literal>
     directory.</para>
 
     <para>The configuration files are split according to the component that is
     used in the testing process:</para>
-        
-        <itemizedlist spacing="compact">
+
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>The Enea Edge Management application</para>
+      </listitem>
+
+      <listitem>
+        <para>uCPE Devices</para>
+      </listitem>
+
+      <listitem>
+        <para>VNFs</para>
+      </listitem>
+    </itemizedlist>
+
+    <section id="config_files_mg">
+      <title>Configuration Files for the Enea Edge Management
+      application</title>
+
+      <para>In order to create a connection with the Enea Edge Management
+      application, the following parameters have to be specified:</para>
+
+      <itemizedlist spacing="compact">
         <listitem>
-          <para>The Enea Edge Management application</para>
+          <para>Enea Edge Management username</para>
         </listitem>
 
         <listitem>
-          <para>uCPE Devices</para>
+          <para>Enea Edge Management password</para>
         </listitem>
 
         <listitem>
-          <para>VNFs</para>
+          <para>Enea Edge Management IP address or FQDN</para>
         </listitem>
       </itemizedlist>
 
-    <section id="config_files_mg">
-      <title>Configuration Files for the Enea Edge Management application</title>
-
-      <para>In order to create a connection with the Enea Edge Management application, the
-      following parameters have to be updated:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para>Enea Edge Management username</para>
-          </listitem>
-
-          <listitem>
-            <para>Enea Edge Management password</para>
-          </listitem>
-
-          <listitem>
-            <para>Enea Edge Management IP address</para>
-          </listitem>
-        </itemizedlist>
-
-      <para><emphasis role="bold">Updating the configuration file</emphasis></para>
+      <para><emphasis role="bold">Updating the configuration
+      file</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Open <filename>modules/enea/config/uCPEManager/ucpem01.json</filename></para>
-                  
-                  <programlisting>{
+          <para>Open
+          <filename>modules/enea/config/Management/management01.json</filename></para>
+
+          <programlisting>{
   "ucpe_usr":"admin",
   "ucpe_pass":"admin",
   "ucpe_host":"172.24.3.92"
@@ -300,30 +318,41 @@
 
         <listitem>
           <para>Update the username, password and IP address</para>
+
+          <note>
+            <para>The
+            <filename>modules/enea/config/uCPEManager/ucpem01.json</filename>
+            file is a symbolic link to the
+            <filename>modules/enea/config/Management/management01.json</filename>
+            file. It is deprecated, and it will be removed starting with the
+            next major release.</para>
+          </note>
         </listitem>
       </orderedlist>
 
       <para>It is possible to use another JSON file for the connection with
       the Enea Edge Management application.</para>
 
-      <para><emphasis role="bold">Changing the path for the Enea Edge Management JSON
-      file</emphasis></para>
-          
-          <orderedlist>
-          <listitem>
-            <para>Open the <filename>automation_framework/uCPEMgrHTTPClientRestAPIv2.py</filename> file.</para>
-          </listitem>
+      <para><emphasis role="bold">Changing the path for the Enea Edge
+      Management JSON file</emphasis></para>
 
-          <listitem>
-            <para>Go to the <literal>create_json_file</literal> method from the
-            <literal>eneaUcpeMgrConfig</literal> class.</para>
-          </listitem>
+      <orderedlist>
+        <listitem>
+          <para>Open the
+          <filename>automation_framework/ManagementHTTPClientRestAPIv2.py</filename>
+          file.</para>
+        </listitem>
 
-          <listitem>
-            <para>Change the path of the Enea Edge Management JSON file in the
-            <literal>self.ucpe_json_file</literal> variable.</para>
-          </listitem>
-        </orderedlist>
+        <listitem>
+          <para>Go to the <literal>create_json_file</literal> method from the
+          <literal>ManagementConfig</literal> class.</para>
+        </listitem>
+
+        <listitem>
+          <para>Change the path of the Enea Edge Management JSON file in the
+          <literal>self.ucpe_json_file</literal> variable.</para>
+        </listitem>
+      </orderedlist>
     </section>
 
     <section id="config_files_ucpe_devices">
@@ -331,42 +360,42 @@
 
       <para>The <literal>modules/enea/config/uCPEDevices</literal> directory
       contains the following:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para>Examples of the configuration files for different uCPE
-            Devices:
-            <literal>inteld1521-16</literal>,<literal>inteld1521-17</literal>,
-            and so on.</para>
-          </listitem>
 
-          <listitem>
-            <para>The scripts for generating all configuration files in
-            <literal>scripts</literal> folder.</para>
-          </listitem>
-        </itemizedlist>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>Examples of the configuration files for different uCPE
+          Devices:
+          <literal>inteld1521-16</literal>,<literal>inteld1521-17</literal>,
+          and so on.</para>
+        </listitem>
+
+        <listitem>
+          <para>The scripts for generating all configuration files in
+          <literal>scripts</literal> folder.</para>
+        </listitem>
+      </itemizedlist>
 
       <para>The following scripts are implemented to generate the
       configuration files:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para><filename>generate_device_config.py</filename> - generates the
-            JSON configuration file for the uCPE Device.</para>
-          </listitem>
 
-          <listitem>
-            <para><filename>generate_bridges_config_files.py</filename> -
-            generates configuration files for all possible OVS bridges created
-            on the uCPE Device.</para>
-          </listitem>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para><filename>generate_device_config.py</filename> - generates the
+          JSON configuration file for the uCPE Device.</para>
+        </listitem>
 
-          <listitem>
-            <para><filename>generate_nics_config_files.py</filename> - generates
-            the configuration files for all possible NICs created on the uCPE
-            Device.</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para><filename>generate_bridges_config_files.py</filename> -
+          generates configuration files for all possible OVS bridges created
+          on the uCPE Device.</para>
+        </listitem>
+
+        <listitem>
+          <para><filename>generate_nics_config_files.py</filename> - generates
+          the configuration files for all possible NICs created on the uCPE
+          Device.</para>
+        </listitem>
+      </itemizedlist>
 
       <section id="generate_config">
         <title>Generating Device config</title>
@@ -387,13 +416,14 @@
           </listitem>
         </itemizedlist>
 
-        <para><emphasis role="bold">Generating the device config</emphasis></para>
+        <para><emphasis role="bold">Generating the device
+        config</emphasis></para>
 
         <orderedlist>
           <listitem>
             <para>Run <filename>generate_device_config.py</filename>:</para>
-                        
-                        <programlisting>testHarness-venv)&gt; python generate_device_config.py
+
+            <programlisting>testHarness-venv)&gt; python generate_device_config.py
 Device name: test
 Device ID: test_id
 Device groupings tags [ ]: test_id
@@ -413,13 +443,15 @@ store.json</programlisting>
           </listitem>
 
           <listitem>
-            <para>Check the configuration files in the <literal>modules/enea/config/uCPEDevices/test</literal>
+            <para>Check the configuration files in the
+            <literal>modules/enea/config/uCPEDevices/test</literal>
             directory:</para>
 
             <itemizedlist>
               <listitem>
                 <para><filename>test.json</filename> file - contains all the
-                input parameters for the <literal>test</literal> device:</para>
+                input parameters for the <literal>test</literal>
+                device:</para>
 
                 <programlisting>{
     "deviceId": "test_id",
@@ -445,9 +477,9 @@ store.json</programlisting>
               </listitem>
 
               <listitem>
-                <para><filename>store.json</filename> file - contains the input
-                parameters used for creating an offline config for the uCPE
-                Device:</para>
+                <para><filename>store.json</filename> file - contains the
+                input parameters used for creating an offline config for the
+                uCPE Device:</para>
 
                 <programlisting>{
     "version": "2.4.0",
@@ -462,8 +494,8 @@ store.json</programlisting>
 
         <para>The <filename>generate_device_config.py</filename> script can be
         executed in a non-interactive way, as follows:</para>
-                
-<programlisting>testHarness-venv)&gt;python generate_device_config.py --device_name=test 
+
+        <programlisting>testHarness-venv)&gt;python generate_device_config.py --device_name=test 
   --device_id=test_id --device_grouping_tags=test_id --version 2.4.0 
   --device_ip_addr=10.0.0.1 --call_home=false --mgmt_nic=eth0 --wan_nic=eth1 
   --lan_nic=eth2 --wap_nic=wlan0</programlisting>
@@ -474,8 +506,8 @@ store.json</programlisting>
         scenario.</para>
 
         <para>When the script is interactively run, the parameter's value
-        between the square brackets is the default one. It can be omitted when the
-        script is non-interactively run.</para>
+        between the square brackets is the default one. It can be omitted when
+        the script is non-interactively run.</para>
       </section>
 
       <section id="nic_config_files">
@@ -486,18 +518,20 @@ store.json</programlisting>
 
         <orderedlist>
           <listitem>
-            <para>Run <filename>generate_nics_config_files.py</filename>:</para>
-                        
-                        <programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py
+            <para>Run
+            <filename>generate_nics_config_files.py</filename>:</para>
+
+            <programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py
 Device name: test
 Check 'test' directory for JSON configuration files</programlisting>
           </listitem>
 
           <listitem>
-            <para>Check the configuration files for all interface types in the 
+            <para>Check the configuration files for all interface types in the
             <literal>modules/enea/config/uCPEDevices/test</literal> directory.
-            The interface name is defined in the <filename>test.json</filename>
-            file. The NIC config files have the following structure:
+            The interface name is defined in the
+            <filename>test.json</filename> file. The NIC config files have the
+            following structure:
             <literal>&lt;interface_name&gt;_&lt;interface_type&gt;_nic.json</literal>.
             For the <literal>eth2</literal> lan interface, the following JSON
             files are created:</para>
@@ -528,8 +562,8 @@ Check 'test' directory for JSON configuration files</programlisting>
               </listitem>
 
               <listitem>
-                <para><filename>lan_wan_nic.json</filename> - contains Interface
-                type: <literal>WAN</literal>; Address assignment:
+                <para><filename>lan_wan_nic.json</filename> - contains
+                Interface type: <literal>WAN</literal>; Address assignment:
                 <literal>DHCP</literal>.</para>
 
                 <programlisting>{
@@ -542,8 +576,8 @@ Check 'test' directory for JSON configuration files</programlisting>
               </listitem>
 
               <listitem>
-                <para><filename>wap_wap_nic.json</filename> - contains Interface
-                type: <literal>WAP</literal>; Country Code:
+                <para><filename>wap_wap_nic.json</filename> - contains
+                Interface type: <literal>WAP</literal>; Country Code:
                 <literal>SE</literal>; Wireless band:
                 <literal>band5GHz</literal>; Wireless Mode: <literal>802.11
                 g/n</literal>; Radio Channel: <literal>42 (80 MHz
@@ -561,10 +595,10 @@ Check 'test' directory for JSON configuration files</programlisting>
           </listitem>
         </orderedlist>
 
-        <para>The <filename>generate_nics_config_files.py</filename> script can
-        be executed in a non-interactive way, as follows:</para>
-                
-                <programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py  --device_name=test
+        <para>The <filename>generate_nics_config_files.py</filename> script
+        can be executed in a non-interactive way, as follows:</para>
+
+        <programlisting>(testHarness-venv)&gt; python generate_nics_config_files.py  --device_name=test
 Check 'test' directory for JSON configuration files</programlisting>
 
         <para>The values from the JSON files depend on the input
@@ -579,74 +613,76 @@ Check 'test' directory for JSON configuration files</programlisting>
 
         <orderedlist>
           <listitem>
-            <para>Run <filename>generate_bridges_config_files.py</filename>:</para>
-                        
-                        <programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py
+            <para>Run
+            <filename>generate_bridges_config_files.py</filename>:</para>
+
+            <programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py
 Device name: test
 Check 'test' directory for JSON configuration files</programlisting>
           </listitem>
 
           <listitem>
-            <para>Check the configuration files in the 
+            <para>Check the configuration files in the
             <literal>modules/enea/config/uCPEDevices/test</literal> directory.
             The name of OVS bridges type has the following structure:
             <literal>&lt;bridge_type&gt;_br.json</literal>. The following JSON
             files are created:</para>
-                        
-                        <itemizedlist>
-                <listitem>
-                  <para><filename>ibm_br.json</filename> - contains information about the
-                  <literal>Inband management OVS bridge</literal>:</para>
 
-                  <programlisting>{
+            <itemizedlist>
+              <listitem>
+                <para><filename>ibm_br.json</filename> - contains information
+                about the <literal>Inband management OVS
+                bridge</literal>:</para>
+
+                <programlisting>{
     "name": "ibm_br",
     "type": "inband_mgmt"
 }</programlisting>
-                </listitem>
+              </listitem>
 
-                <listitem>
-                  <para><filename>sfc_br.json</filename> - contains:
-                  <literal>Dataplane OVS bridge</literal>; Type:
-                  <literal>integration</literal>:</para>
+              <listitem>
+                <para><filename>sfc_br.json</filename> - contains:
+                <literal>Dataplane OVS bridge</literal>; Type:
+                <literal>integration</literal>:</para>
 
-                  <programlisting>{
+                <programlisting>{
     "name": "sfc_br",
     "type": "dataplane",
     "subType": "integration",
     "interfaces": []
 }</programlisting>
-                </listitem>
+              </listitem>
 
-                <listitem>
-                  <para><filename>vnfmgmt_ipv4_br.json</filename> - contains
-                  <literal>VNF Management OVS bridge, IPv4</literal>:</para>
+              <listitem>
+                <para><filename>vnfmgmt_ipv4_br.json</filename> - contains
+                <literal>VNF Management OVS bridge, IPv4</literal>:</para>
 
-                  <programlisting>{
+                <programlisting>{
     "name": "vnfmgmt_ipv4_br",
     "type": "vnfMgmt",
     "vnfMgmtAddress": "10.0.0.1"
 }</programlisting>
-                </listitem>
+              </listitem>
 
-                <listitem>
-                  <para><filename>vnfmgmt_ipv6_br.json</filename> - contains
-                  <literal>VNF Management OVS bridge, IPv6</literal>:</para>
+              <listitem>
+                <para><filename>vnfmgmt_ipv6_br.json</filename> - contains
+                <literal>VNF Management OVS bridge, IPv6</literal>:</para>
 
-                  <programlisting>
+                <programlisting>
 {
     "name": "vnfmgmt_ipv6_br",
     "type": "vnfMgmt",
     "vnfMgmtAddress": "2001:db8:0:0:0:0:0:0"
 }</programlisting>
-                </listitem>
+              </listitem>
 
-                <listitem>
-                  <para><filename>lan_br.json</filename> - contains
-                  <literal>Dataplane OVS bridge</literal>; Type:
-                  <literal>communication</literal>; Interface:
-                  <literal>eth2</literal>:</para>
+              <listitem>
+                <para><filename>lan_br.json</filename> - contains
+                <literal>Dataplane OVS bridge</literal>; Type:
+                <literal>communication</literal>; Interface:
+                <literal>eth2</literal>:</para>
 
-                  <programlisting>lan_br.json
+                <programlisting>lan_br.json
 {
     "name": "lan_br",
     "type": "dataplane",
@@ -655,28 +691,28 @@ Check 'test' directory for JSON configuration files</programlisting>
         "eth2"
     ]
 }</programlisting>
-                </listitem>
+              </listitem>
 
-                <listitem>
-                  <para><filename>wap_br.json</filename> - contains
-                  <literal>Dataplane OVS bridge</literal>; Type:
-                  <literal>communication</literal>:</para>
+              <listitem>
+                <para><filename>wap_br.json</filename> - contains
+                <literal>Dataplane OVS bridge</literal>; Type:
+                <literal>communication</literal>:</para>
 
-                  <programlisting>{
+                <programlisting>{
     "name": "wap_br",
     "type": "dataplane",
     "subType": "communication",
     "interfaces": []
 }</programlisting>
-                </listitem>
-              </itemizedlist>
+              </listitem>
+            </itemizedlist>
           </listitem>
         </orderedlist>
 
         <para>The <filename>generate_bridges_config_files.py</filename> script
         can be executed in a non-interactive way, as follows:</para>
-                
-                <programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py --device-name=test
+
+        <programlisting>(testHarness-venv)&gt; python generate_bridges_config_files.py --device-name=test
 Check 'test' directory for JSON configuration files</programlisting>
 
         <para>The values from the JSON files depend on the input
@@ -687,14 +723,14 @@ Check 'test' directory for JSON configuration files</programlisting>
     <section id="config_file_vnf">
       <title>Configuration Files for the VNF</title>
 
-      <para>The VNF directory <literal>modules/enea/config/VNF</literal>, 
-          contains subdirectories for each defined VNF:
+      <para>The VNF directory <literal>modules/enea/config/VNF</literal>,
+      contains subdirectories for each defined VNF:
       <literal>fortigateFWImage</literal>, <literal>junipervSRXImae</literal>
       and so on.</para>
 
-      <para>Each VNF subdirectory contains configuration files for: cloud-init, 
-          VNF Descriptors, VNF instances. These configuration files are
-      examples used in test scenarios from Enea Edge Automation.</para>
+      <para>Each VNF subdirectory contains configuration files for:
+      cloud-init, VNF Descriptors, VNF instances. These configuration files
+      are examples used in test scenarios from Enea Edge Automation.</para>
 
       <para>For more details about the test scenarios from
       <literal>modules/enea/scenario/</literal>, see <xref
@@ -705,72 +741,88 @@ Check 'test' directory for JSON configuration files</programlisting>
   <section id="AFTH_automation">
     <title>The Automation Framework</title>
 
-    <para>The Automation Framework scripts described in the following section 
-        are located in the <literal>&lt;AF-installdir&gt;/automation_framework</literal> directory.</para>
+    <para>The Automation Framework scripts described in the following section
+    are located in the
+    <literal>&lt;Automation-installdir&gt;/automation_framework</literal>
+    directory.</para>
 
     <section id="httpclient_class">
-      <title>The uCPEMgrHTTPClient class</title>
+      <title>The ManagementClient class</title>
 
-      <para>The <literal>uCPEMgrHTTPClient</literal> class is implemented in the 
-          <filename>uCPEMgrHTTPClientRestAPIv2.py</filename> script.</para>
+      <para>The <literal>ManagementClient</literal> class is implemented in
+      the <filename>ManagementHTTPClientRestAPIv2.py</filename> script.</para>
 
-      <para>The scope of this class is to send REST API requests to the Enea Edge Management application.
-      The methods of the <literal>uCPEMgrHTTPClient</literal> class
-      represent REST API calls to the Enea Edge Management application or ways for creating the
-      objects that are used as input for sending the request.</para>
+      <para>The scope of this class is to send REST API requests to the Enea
+      Edge Management application. The methods of the
+      <literal>ManagementClient</literal> class represent REST API calls to
+      the Enea Edge Management application or ways for creating the objects
+      that are used as input for sending the request.</para>
 
-      <para>The dictionaries used as the payload in the REST API requests are created
-      in methods from this class. The output of these methods is used as input
-      for the REST API request payload.</para>
+      <para>The dictionaries used as the payload in the REST API requests are
+      created in methods from this class. The output of these methods is used
+      as input for the REST API request payload.</para>
 
       <para>Each method has a short description in the header, as
       follows:</para>
-          
-          <itemizedlist spacing="compact">
-          <listitem>
-            <para>The scope of the method</para>
-          </listitem>
 
-          <listitem>
-            <para>The input parameters</para>
-          </listitem>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>The scope of the method</para>
+        </listitem>
 
-          <listitem>
-            <para>The return value from the source code</para>
-          </listitem>
+        <listitem>
+          <para>The input parameters</para>
+        </listitem>
 
-          <listitem>
-            <para>The URL for the REST API call</para>
-          </listitem>
+        <listitem>
+          <para>The return value from the source code</para>
+        </listitem>
 
-          <listitem>
-            <para>The payload dictionary for the REST API call</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para>The URL for the REST API call</para>
+        </listitem>
+
+        <listitem>
+          <para>The payload dictionary for the REST API call</para>
+        </listitem>
+      </itemizedlist>
 
       <para>Other classes from the <literal>automation_framework</literal>
       directory inherit this class, and call its methods.</para>
+      
+      <note>
+        <para>The <literal>uCPEMgrHTTPClient</literal> class is a wrapper of
+        the <literal>ManagementClient</literal> class. All the methods defined
+        in the <literal>ManagementClient</literal> class can be used when the
+        <literal>uCPEMgrHTTPClient</literal> object is instantiated. The
+        <literal>uCPEMgrHTTPClient</literal> object is deprecated and will be
+        removed starting with the next major release. It is recommended to use
+        the <literal>ManagementClient</literal> class instead.</para>
+      </note>
 
       <para><emphasis role="bold">Examples</emphasis>:</para>
 
       <orderedlist spacing="compact">
         <listitem>
-          <para>uCPE Device functionalities are defined in the <literal>uCPEDeviceHandler</literal> class.</para>
+          <para>uCPE Device functionalities are defined in the
+          <literal>uCPEDeviceHandler</literal> class.</para>
         </listitem>
 
         <listitem>
-          <para>The <literal>uCPEDeviceHandler</literal> class inherites the <literal>uCPEMgrHTTPClient</literal> class.</para>
+          <para>The <literal>uCPEDeviceHandler</literal> class inherites the
+          <literal>ManagementClient</literal> class.</para>
         </listitem>
 
         <listitem>
-          <para>The <literal>uCPEDeviceHandler</literal> method calls methods from 
-                  <literal>uCPEMgrHTTPClient</literal> to send requests to the Enea Edge Management application.</para>
+          <para>The <literal>uCPEDeviceHandler</literal> method calls methods
+          from <literal>ManagementClient</literal> to send requests to the
+          Enea Edge Management application.</para>
         </listitem>
 
         <listitem>
-          <para>Methods from <literal>uCPEMgrHTTPClient</literal> create the
-          payload dictionary starting from the input parameters and send the REST API
-          request.</para>
+          <para>Methods from <literal>ManagementClient</literal> create the
+          payload dictionary starting from the input parameters and send the
+          REST API request.</para>
         </listitem>
 
         <listitem>
@@ -783,18 +835,19 @@ Check 'test' directory for JSON configuration files</programlisting>
     <section id="mg_functionalities">
       <title>Handlers for Enea Edge Management Functionalities</title>
 
-      <para>In Enea Edge Automation the modules of the Enea Edge Management application are
-      represented by Python classes called <literal>Handlers</literal>. Each
-      Python class represents a functionality of the Enea Edge Management application.</para>
+      <para>In Enea Edge Automation the modules of the Enea Edge Management
+      application are represented by Python classes called
+      <literal>Handlers</literal>. Each Python class represents a
+      functionality of the Enea Edge Management application.</para>
 
-      <para>These classes are implemented in the Python scripts that have a 
-          <literal>Handler</literal> string included in the name. The name of the
+      <para>These classes are implemented in the Python scripts that have a
+      <literal>Handler</literal> string included in the name. The name of the
       classes is the same as the name of Python script.</para>
 
-      <para>For the usage of any class, run the Python script with the <emphasis
-      role="bold">--help</emphasis> option:</para>
-          
-          <programlisting>python automation_framework/uCPEDeviceHandler.py --help
+      <para>For the usage of any class, run the Python script with the
+      <emphasis role="bold">--help</emphasis> option:</para>
+
+      <programlisting>python automation_framework/uCPEDeviceHandler.py --help
 Usage: uCPEDeviceHandler.py [OPTIONS] [PARAMETERS]...
 
 Options:
@@ -807,12 +860,12 @@ Options:
   -o, --display_output    Display output of the method
   --help                  Show this message and exit.</programlisting>
 
-      <para>In the <literal>test_harness/&lt;module name&gt;</literal> directory,
-      the Ansible Playbooks are implemented for running the Python scripts
-      from Enea Edge Automation. The name of the Ansible Playbooks is the same
-      as the name of the Python method. The Python command is between the 
-      <literal>&lt;command&gt; ... &lt;/command&gt;</literal> tags from the
-      <literal>*.yml</literal> files.</para>
+      <para>In the <literal>test_harness/&lt;module name&gt;</literal>
+      directory, the Ansible Playbooks are implemented for running the Python
+      scripts from Enea Edge Automation. The name of the Ansible Playbooks is
+      the same as the name of the Python method. The Python command is between
+      the <literal>&lt;command&gt; ... &lt;/command&gt;</literal> tags from
+      the <literal>*.yml</literal> files.</para>
 
       <section id="mg_functionalities_ucpe">
         <title>uCPE Device</title>
@@ -847,8 +900,8 @@ Options:
 
         <itemizedlist spacing="compact">
           <listitem>
-            <para>Configuration file located in 
-                        <literal>modules/enea/config/uCPEDevices</literal>, with the
+            <para>Configuration file located in
+            <literal>modules/enea/config/uCPEDevices</literal>, with the
             <emphasis role="bold">-f</emphasis> option.</para>
           </listitem>
 
@@ -885,19 +938,19 @@ addDpdkExternalInterface -f
 modules/enea/config/uCPEDevices/&lt;device_name&gt;/&lt;interface_name&gt;_dpdk_nic.json </programlisting>
 
         <para><emphasis role="bold">Example:</emphasis></para>
-                
-                <programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
+
+        <programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
 addDpdkExternalInterface -f modules/enea/config/uCPEDevices/vep1445-8/lan_dpdk_nic.json</programlisting>
 
         <para>The syntax for running the
         <literal>addDpdkExternalInterface</literal> functionality:</para>
-                
+
         <programlisting>python automation_framework/uCPEDeviceHandler.py -d &lt;device_name&gt; -m 
 addDpdkExternalInterface &lt;interface_name&gt; &lt;dpdk_type&gt;</programlisting>
 
         <para><emphasis role="bold">Example:</emphasis></para>
-                
-                <programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
+
+        <programlisting>python automation_framework/uCPEDeviceHandler.py -d vep1445-8 -m 
 addDpdkExternalInterface eno4 vfio-pci</programlisting>
       </section>
 
@@ -907,23 +960,23 @@ addDpdkExternalInterface eno4 vfio-pci</programlisting>
         <para>The Enea Edge Management functionalities regarding the offline
         configuration are implemented as follows:</para>
 
-<itemizedlist>
-            <listitem>
-              <para><filename>automation_framework/OfflineConfigHandler.py</filename>
-              - <literal>OfflineConfigHandler</literal> class has methods for
-              adding an offline config, removing an offline config, uploading
-              an offline config on a uCPE Device, and so on.</para>
-            </listitem>
+        <itemizedlist>
+          <listitem>
+            <para><filename>automation_framework/OfflineConfigHandler.py</filename>
+            - <literal>OfflineConfigHandler</literal> class has methods for
+            adding an offline config, removing an offline config, uploading an
+            offline config on a uCPE Device, and so on.</para>
+          </listitem>
 
-            <listitem>
-              <para><filename>automation_framework/Configuration.py</filename> -
-              <literal>Configuration</literal> class has methods for
-              configuring the uCPE Device: DPDK, external interface, and OVS
-              bridges. The methods of the <literal>Configuration</literal>
-              class are used in the <literal>uCPEDeviceHandler</literal> and
-              <literal>OfflineConfigHandler</literal> classes.</para>
-            </listitem>
-          </itemizedlist>
+          <listitem>
+            <para><filename>automation_framework/Configuration.py</filename> -
+            <literal>Configuration</literal> class has methods for configuring
+            the uCPE Device: DPDK, external interface, and OVS bridges. The
+            methods of the <literal>Configuration</literal> class are used in
+            the <literal>uCPEDeviceHandler</literal> and
+            <literal>OfflineConfigHandler</literal> classes.</para>
+          </listitem>
+        </itemizedlist>
 
         <para>The <literal>OfflineConfigHandler</literal> class inherites the
         <literal>Configuration</literal> class with all its methods.</para>
@@ -931,18 +984,19 @@ addDpdkExternalInterface eno4 vfio-pci</programlisting>
         <para>The functionalities for the <literal>adding offline config
         store</literal>, <literal>removing offline config store</literal>,
         <literal>configuring external interfaces</literal>,
-        <literal>configuring OVS bridges</literal> can be run using the:</para>
+        <literal>configuring OVS bridges</literal> can be run using
+        the:</para>
 
-<itemizedlist
-            spacing="compact">
-            <listitem>
-              <para>Configuration file located in <literal>modules/enea/config/uCPEDevices</literal>.</para>
-            </listitem>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>Configuration file located in
+            <literal>modules/enea/config/uCPEDevices</literal>.</para>
+          </listitem>
 
-            <listitem>
-              <para>Input parameters.</para>
-            </listitem>
-          </itemizedlist>
+          <listitem>
+            <para>Input parameters.</para>
+          </listitem>
+        </itemizedlist>
 
         <para>The other functionalities can be run using only input
         parameters.</para>
@@ -951,7 +1005,7 @@ addDpdkExternalInterface eno4 vfio-pci</programlisting>
         script with the <emphasis role="bold">-v/--verbose</emphasis>
         option:</para>
 
-<programlisting>python automation_framework/OfflineConfigHandler.py -v
+        <programlisting>python automation_framework/OfflineConfigHandler.py -v
 Info about OfflineConfigHandler methods
 ...
 Method: addOfflineConfigStore
@@ -962,47 +1016,48 @@ Parameters: version, deviceId, deviceGroupingTags, descr=''
         <literal>addOfflineConfigStore</literal> using the configuration
         file:</para>
 
-<programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
+        <programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
 addOfflineConfigStore -f &lt;path_to_store_configuration_file&gt;</programlisting>
 
         <para><emphasis role="bold">Example:</emphasis></para>
 
-<programlisting>python automation_framework/OfflineConfigHandler.py -s testOfflienConfig -m 
+        <programlisting>python automation_framework/OfflineConfigHandler.py -s testOfflienConfig -m 
 addOfflineConfigStore -f modules/enea/config/uCPEDevices/test/store.json</programlisting>
 
-        <para>The syntax for running the <literal>addOfflineConfigStore</literal>
-        functionality using input parameters: <literal>version</literal>,
-        <literal>deviceId</literal>, <literal>deviceGroupingTags</literal>,
-        <literal>desc</literal>:</para>
+        <para>The syntax for running the
+        <literal>addOfflineConfigStore</literal> functionality using input
+        parameters: <literal>version</literal>, <literal>deviceId</literal>,
+        <literal>deviceGroupingTags</literal>, <literal>desc</literal>:</para>
 
-<programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
+        <programlisting>python automation_framework/OfflineConfigHandler.py -s &lt;store_name&gt; -m 
 addOfflineConfigStore &lt;version&gt; &lt;deviceId&gt; &lt;deviceGroupingTags&gt;</programlisting>
 
         <para><emphasis role="bold">Example:</emphasis></para>
 
-<programlisting>python automation_framework/OfflineConfigHandler.py -s testStoreName -m  
+        <programlisting>python automation_framework/OfflineConfigHandler.py -s testStoreName -m  
 addOfflineConfigStore 2.4.0 deviceId customerTag</programlisting>
       </section>
 
       <section id="custom_scripts_mg_func">
         <title>Custom scripts</title>
 
-        <para>All the Enea Edge Management functionalities regarding the custom
-        scripts are implemented in the <filename>CustomScriptsHandler.py</filename>
-        script.</para>
+        <para>All the Enea Edge Management functionalities regarding the
+        custom scripts are implemented in the
+        <filename>CustomScriptsHandler.py</filename> script.</para>
 
         <para>The <literal>CustomScriptsHandler</literal> class is implemented
         in <filename>CustomScriptsHandler.py</filename> script.</para>
 
-        <para>Examples of custom scripts are in the 
-<literal>modules/enea/config/customScripts/</literal> directory. They
-        can be used when running a Python method from the <literal>CustomScriptsHandler</literal> class.</para>
+        <para>Examples of custom scripts are in the
+        <literal>modules/enea/config/customScripts/</literal> directory. They
+        can be used when running a Python method from the
+        <literal>CustomScriptsHandler</literal> class.</para>
 
         <para>To list the implemented methods (functionalities), run the
         script with the <emphasis role="bold">-v/--verbose</emphasis>
         option:</para>
 
-<programlisting>python automation_framework/CustomScriptsHandler.py -v
+        <programlisting>python automation_framework/CustomScriptsHandler.py -v
 Info about CustomScriptHandler methods
 ...
 Method: uploadCustomScript
@@ -1012,7 +1067,7 @@ Parameters: customScript, phase
         <para>The syntax for running the <literal>uploadCustomScript</literal>
         functionality starting from the input parameters:</para>
 
-<programlisting>python automation_framework/CustomScriptsHandler.py -m 
+        <programlisting>python automation_framework/CustomScriptsHandler.py -m 
 uploadCustomScript &lt;customScript&gt; &lt;phase&gt;</programlisting>
 
         <para><emphasis role="bold">Example</emphasis>:</para>
@@ -1026,9 +1081,9 @@ modules/enea/config/customScripts/test_fail_after_once once-after-startup</progr
       <section id="device_upgrade_mg_func">
         <title>Device upgrade</title>
 
-        <para>The Enea Edge Management functionalities regarding the uCPE Device
-        upgrade are implemented in the <filename>DeviceUpgradeHandler.py</filename>
-        script.</para>
+        <para>The Enea Edge Management functionalities regarding the uCPE
+        Device upgrade are implemented in the
+        <filename>DeviceUpgradeHandler.py</filename> script.</para>
 
         <para>The <literal>DeviceUpgradeHandler</literal> class is implemented
         in the <filename>DeviceUpgradeHandler.py</filename> script.</para>
@@ -1037,7 +1092,7 @@ modules/enea/config/customScripts/test_fail_after_once once-after-startup</progr
         script with the <emphasis role="bold">-v/--verbose</emphasis>
         option:</para>
 
-<programlisting>python automation_framework/DeviceUpgradeHandler.py -v
+        <programlisting>python automation_framework/DeviceUpgradeHandler.py -v
 Info about DeviceUpgradeHandler methods
 ...
 Method: uploadImage
@@ -1047,7 +1102,7 @@ Parameters: imagePath, type, module='VcpeAgent'
         <para>The syntax for running the <literal>uploadImage</literal>
         functionality starting from the input parameters:</para>
 
-<programlisting>python automation_framework/DeviceUpgradeHandler.py -m 
+        <programlisting>python automation_framework/DeviceUpgradeHandler.py -m 
 uploadImage &lt;imagePath&gt; &lt;type&gt;</programlisting>
 
         <para>The default value for the <literal>module</literal> is
@@ -1068,45 +1123,27 @@ uploadImage &lt;imagePath&gt; &lt;type&gt;</programlisting>
         <para>The Enea Edge Management functionalities regarding the VNF are
         implemented in the <filename>VNFHandler.py</filename> script.</para>
 
-        <para>The <literal>VNFHandler</literal> class is implemented in
-        the <filename>VNFHandler.py</filename> script.</para>
+        <para>The <literal>VNFHandler</literal> class is implemented in the
+        <filename>VNFHandler.py</filename> script.</para>
 
         <para>To list the implemented methods (functionalities), run the
         script with the <emphasis role="bold">-v/--verbose</emphasis>
         option:</para>
 
-<programlisting>python automation_framework/VNFHandler.py -v
+        <programlisting>python automation_framework/VNFHandler.py -v
 Info about VNFHandler methods
 ...
 Method: getVNFDescriptorByName
 Parameters: vnfDescriptorName
 ...</programlisting>
 
-        <para>The syntax for running the <literal>getVNFDescriptorByName</literal>
-        functionality starting from the input parameters:</para>
-
-<programlisting>python automation_framework/VNFHandler.py 
-[-m getVNFDescriptorByName &lt;vnfDescriptorName&gt; [-o]] [-v]</programlisting>
-
-        <para>Where the following are included:</para>
-
-<itemizedlist spacing="compact">
-            <listitem>
-              <para><emphasis role="bold">vnfDescriptorName</emphasis> - name
-              of the VNF Descriptor</para>
-            </listitem>
-
-            <listitem>
-              <para><emphasis role="bold">v</emphasis> - verbose option</para>
-            </listitem>
+        <para>The syntax for running the
+        <literal>getVNFDescriptorByName</literal> functionality starting from
+        the input parameters:</para>
 
-            <listitem>
-              <para><emphasis role="bold">o</emphasis> - displays the full
-              output</para>
-            </listitem>
-          </itemizedlist>
+        <programlisting>python automation_framework/VNFHandler.py -m getVNFDescriptorByName &lt;vnfDescriptorName&gt; -o</programlisting>
 
-        <para><emphasis>Example:</emphasis></para>
+        <para><emphasis role="bold">Example:</emphasis></para>
 
         <programlisting>python automation_framework/VNFHandler.py -m getVNFDescriptorByName fortigateImage -o</programlisting>
 
@@ -1116,43 +1153,43 @@ Parameters: vnfDescriptorName
       <section id="mg_funcs">
         <title>Enea Edge Management</title>
 
-        <para>The functionalities regarding the Enea Edge Management configuration
-        are implemented in the <filename>uCPEManagerHandler.py</filename>
-        script.</para>
+        <para>The functionalities regarding the Enea Edge Management
+        configuration are implemented in the
+        <filename>ManagementHandler.py</filename> script.</para>
 
-        <para>The <literal>uCPEManagerHandler</literal> class is implemented
-        in the <filename>uCPEManagerHandler.py</filename> script.</para>
+        <para>The <literal>ManagementHandler</literal> class is implemented in
+        the <filename>ManagementHandler.py</filename> script.</para>
 
         <para>To list the implemented methods (functionalities), run the
         script with the <emphasis role="bold">-v/--verbose</emphasis>
         option:</para>
 
-<programlisting>python automation_framework/uCPEManagerHandler.py -v
-Info about uCPEManagerHandler methods
+        <programlisting>python automation_framework/ManagementHandler.py -v
+Info about ManagementHandler methods
 ...
-Method: getuCPEManagerVersion
+Method: getManagementVersion
 Parameters(not needed): --
 ...</programlisting>
 
-        <para>The syntax for running the <literal>getuCPEManagerVersion</literal>
-        functionaltity is:</para>
-
-<programlisting>python automation_framework/uCPEManagerHandler.py [-m getuCPEManagerVersion [-o]][-v]</programlisting>
-
-        <para>Where the following are included:</para>
-
-<itemizedlist spacing="compact">
-            <listitem>
-              <para><emphasis role="bold">v</emphasis> - verbose option</para>
-            </listitem>
+        <para>The syntax for running the
+        <literal>getManagementVersion</literal> functionaltity is:</para>
 
-            <listitem>
-              <para><emphasis role="bold">o</emphasis> - displays the full
-              output</para>
-            </listitem>
-          </itemizedlist>
+        <programlisting>python automation_framework/ManagementHandler.py -m getManagementVersion -o</programlisting>
 
         <para>All the other methods run in a similar way.</para>
+
+        <note>
+          <para>The functionalities relating to the Enea Edge Management
+          application configuration are also implemented in the
+          <filename>uCPEManagerHandler.py</filename> script where the
+          <literal>uCPEManagerHandler</literal> class is defined. The
+          <literal>uCPEManagerHandler</literal> class is a wrapper of the
+          <literal>ManagementHandler</literal> class. The
+          <filename>uCPEManagerHandler.py</filename> file is deprecated and
+          will be removed starting with the next major release. It is
+          recommended to use the <filename>ManagementHandler.py</filename>
+          script instead.</para>
+        </note>
       </section>
     </section>
 
@@ -1162,13 +1199,14 @@ Parameters(not needed): --
       <section id="config_class">
         <title>The Configuration class</title>
 
-        <para>The <literal>Configuration</literal> class is implemented in
-        the <filename>Configuration.py</filename> script. The
+        <para>The <literal>Configuration</literal> class is implemented in the
+        <filename>Configuration.py</filename> script. The
         <literal>Configuration</literal> class cannot be independently
         used.</para>
 
         <para>The <literal>uCPEDeviceHandler</literal> and
-        <literal>OfflineConfigHandler</literal> classes inherit the <literal>Configuration</literal> class. The methods should be
+        <literal>OfflineConfigHandler</literal> classes inherit the
+        <literal>Configuration</literal> class. The methods should be
         implemented for both functionalities: uCPE Device and Offline
         config.</para>
       </section>
@@ -1176,52 +1214,53 @@ Parameters(not needed): --
       <section id="logger_class">
         <title>The Logger Class</title>
 
-        <para>The <literal>Logger</literal> class is implemented in
-        the <filename>Logger.py</filename> script. It is inherited in all the
+        <para>The <literal>Logger</literal> class is implemented in the
+        <filename>Logger.py</filename> script. It is inherited in all the
         classes defined in <literal>automation_framework</literal>.</para>
 
         <para>This class defines a logger for displaying the logs from Python
         scripts, in console log and file log.</para>
 
         <para>For console log, the logger has:</para>
-        
+
         <itemizedlist spacing="compact">
-            <listitem>
-              <para>Default severity: <literal>INFO</literal></para>
-            </listitem>
+          <listitem>
+            <para>Default severity: <literal>INFO</literal></para>
+          </listitem>
 
-            <listitem>
-              <para>Format of the logs: <literal>[datetime] [severity]
-              message</literal></para>
-            </listitem>
-          </itemizedlist>
+          <listitem>
+            <para>Format of the logs: <literal>[datetime] [severity]
+            message</literal></para>
+          </listitem>
+        </itemizedlist>
 
         <para>For file log, the logger has:</para>
-        
+
         <itemizedlist spacing="compact">
-            <listitem>
-              <para>Logs path: <literal>log/debug.log</literal></para>
-            </listitem>
+          <listitem>
+            <para>Logs path: <literal>log/debug.log</literal></para>
+          </listitem>
 
-            <listitem>
-              <para>Default severity: <literal>DEBUG</literal></para>
-            </listitem>
+          <listitem>
+            <para>Default severity: <literal>DEBUG</literal></para>
+          </listitem>
 
-            <listitem>
-              <para>Format of the logs: <literal>[severity]
-              [name_of_Python_script] message</literal></para>
-            </listitem>
-          </itemizedlist>
+          <listitem>
+            <para>Format of the logs: <literal>[severity]
+            [name_of_Python_script] message</literal></para>
+          </listitem>
+        </itemizedlist>
       </section>
     </section>
   </section>
 
   <section id="AFTH_test">
     <title>Test Harness</title>
-    
-      <para>The Test Harness sources are in the
-      <literal>&lt;AF-installdir&gt;/test_harness</literal> directory.</para>
- 
+
+    <para>The Test Harness sources are in the
+    <literal>&lt;Automation-installdir&gt;/test_harness</literal>
+    directory.</para>
+
     <section id="indiv_ansible_playbooks">
       <title>Individual Ansible Playbooks</title>
 
@@ -1229,8 +1268,8 @@ Parameters(not needed): --
       structuring the files needed for creating automated test cases using the
       Enea Edge Automation, and provides a way to implement them.</para>
 
-      <para>The <filename>ansible.cfg</filename> file contains an example of the
-      Ansible default configuration. The default value for
+      <para>The <filename>ansible.cfg</filename> file contains an example of
+      the Ansible default configuration. The default value for
       <literal>stdout_callback</literal> is set to
       <literal>selective</literal>, to print only certain tasks. It is
       recommended to switch to <literal>debug</literal> when a test fails. By
@@ -1238,46 +1277,45 @@ Parameters(not needed): --
       <literal>True</literal>, task failures are considered fatal errors and
       the play execution stops.</para>
 
-      <para>All the Playbooks that execute Automation Framework Python modules run on <literal>localhost</literal>.
-      New entries have to be created for direct communication over SSH with
-      the boards.</para>
+      <para>All the Playbooks that execute Automation Framework Python modules
+      run on <literal>localhost</literal>. New entries have to be created for
+      direct communication over SSH with the boards.</para>
 
       <para>The <filename>setup_env.sh</filename> script sets up the
-      <literal>testHarness</literal> test environment by creating
-      the <literal>testHarness-venv</literal> Python virtual environment,
+      <literal>testHarness</literal> test environment by creating the
+      <literal>testHarness-venv</literal> Python virtual environment,
       executing requests needed by Automation Framework Python modules, and
       installing Ansible. The Ansible package version is 2.9.6.</para>
 
       <para>The <literal>test_harness</literal> directory contains all the
-      implemented Ansible Playbooks. This directory contains
-      the <filename>check_errror.yml</filename> Playbook and many subdirectories,
+      implemented Ansible Playbooks. This directory contains the
+      <filename>check_errror.yml</filename> Playbook and many subdirectories,
       each subdirectory representing an Enea Edge Management module.</para>
 
-      <para>The <filename>check_errors.yml</filename> Playbook checks the Python
-      output and returns success or fail results. This file is imported in all
-      playbooks from the <literal>test_harness</literal> directory and it cannot
-      be run standalone.</para>
+      <para>The <filename>check_errors.yml</filename> Playbook checks the
+      Python output and returns success or fail results. This file is imported
+      in all playbooks from the <literal>test_harness</literal> directory and
+      it cannot be run standalone.</para>
 
-      <para>According to their functionality, the Ansible Playbooks that
-      refer to offline configuration are in the <literal>OfflineConfig</literal>
+      <para>According to their functionality, the Ansible Playbooks that refer
+      to offline configuration are in the <literal>OfflineConfig</literal>
       directory, the ones that refers to <literal>CustomScript</literal> are
       in the <literal>CustomScripts</literal>, and so on.</para>
 
       <para>Each Ansible Playbook has a help menu for:</para>
-      
-      <itemizedlist
-          spacing="compact">
-          <listitem>
-            <para>Returning the syntax, and examples for running the
-            Playbook.</para>
-          </listitem>
 
-          <listitem>
-            <para>Warning if the input parameters are wrong or not
-            enough. The input parameters are called <literal>extra-vars</literal> in Ansible
-            playbooks.</para>
-          </listitem>
-        </itemizedlist>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>Returning the syntax, and examples for running the
+          Playbook.</para>
+        </listitem>
+
+        <listitem>
+          <para>Warning if the input parameters are wrong or not enough. The
+          input parameters are called <literal>extra-vars</literal> in Ansible
+          playbooks.</para>
+        </listitem>
+      </itemizedlist>
 
       <para>The help menu is activated when the Playbook is run without any
       parameters.</para>
@@ -1289,7 +1327,7 @@ Parameters(not needed): --
           <para>Display the help menu for
           <filename>addDataPlaneOvsBridge.yml</filename>:</para>
 
-<programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml
+          <programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml
 
 This playbook runs 'addDataPlaneOvsBridge' method from uCPEDeviceHandler module
 
@@ -1322,8 +1360,8 @@ Usage:
         <listitem>
           <para>Run the <filename>addDataPlaneOvsBridge.yml</filename>
           playbook:</para>
-          
-<programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
+
+          <programlisting>ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
 "device=inteld1521-17 bridge_config_file=sfc_br.json"
 ansible-playbook test_harness/uCPEDevice/addDataPlaneOvsBridge.yml -e 
 "device=inteld1521-17 bridge_config_file=lan_br.json"
@@ -1342,17 +1380,17 @@ interfaces=eno4,eno5"</programlisting>
 
       <para>Each Ansible Playbook from the <literal>test_harness</literal>
       directory represents an atomic operation, a basic functionality that is
-      performed on the Enea Edge Management application at a specific period of the time. They can
-      be sequentially run or they can be imported into other playbooks for
-      creating complex scenarios.</para>
+      performed on the Enea Edge Management application at a specific period
+      of the time. They can be sequentially run or they can be imported into
+      other playbooks for creating complex scenarios.</para>
 
       <para><emphasis role="bold">Example:</emphasis></para>
 
       <para>To instantiate a VNF, the following operations have to be
-      performed: connect to the uCPE Device, bind NICs, create an OVS
-      bridge, create a VNF descriptor, and instantiate the VNF on the
-      device. All these operations can be run Playbook after Playbook using
-      the <literal>*.yml</literal> files from the <literal>test_harness</literal>
+      performed: connect to the uCPE Device, bind NICs, create an OVS bridge,
+      create a VNF descriptor, and instantiate the VNF on the device. All
+      these operations can be run Playbook after Playbook using the
+      <literal>*.yml</literal> files from the <literal>test_harness</literal>
       directory.</para>
     </section>
 
@@ -1362,74 +1400,75 @@ interfaces=eno4,eno5"</programlisting>
       <para>All the individual Playbooks can be used as imported Playbooks in
       complex test scenarios.</para>
 
-      <para>The complex scenarios are defined in: <literal>modules/enea/scenario</literal>.</para>
+      <para>The complex scenarios are defined in:
+      <literal>modules/enea/scenario</literal>.</para>
 
       <para>The test scenarios are split into the following:</para>
-      
+
       <itemizedlist spacing="compact">
-          <listitem>
-            <para>Functionalities to be tested and used: the 
-            <literal>CustomScripts, OfflineConfig, ovsTests</literal>
-            directories.</para>
-          </listitem>
+        <listitem>
+          <para>Functionalities to be tested and used: the
+          <literal>CustomScripts, OfflineConfig, ovsTests</literal>
+          directories.</para>
+        </listitem>
 
-          <listitem>
-            <para>Service Creation and Lifecycle:
-            the <literal>chainedVNFsService</literal> directory.</para>
-          </listitem>
+        <listitem>
+          <para>Service Creation and Lifecycle: the
+          <literal>chainedVNFsService</literal> directory.</para>
+        </listitem>
 
-          <listitem>
-            <para>VNF Deployment and Lifecycle:
-            the <literal>fortigateFWService</literal> directory.</para>
-          </listitem>
-        </itemizedlist>
+        <listitem>
+          <para>VNF Deployment and Lifecycle: the
+          <literal>fortigateFWService</literal> directory.</para>
+        </listitem>
+      </itemizedlist>
 
       <para>For each test scenario, the <literal>README</literal> file
       contains:</para>
-      
+
       <itemizedlist>
-          <listitem>
-            <para>Preconditions:</para>
-            
-            <itemizedlist spacing="compact">
-                <listitem>
-                  <para>The configuration files to be updated</para>
-                </listitem>
-
-                <listitem>
-                  <para>The VNF images to be copied</para>
-                </listitem>
-
-                <listitem>
-                  <para>The license file needed from the provider and added to a
-                  specific path, etc.</para>
-                </listitem>
-              </itemizedlist>
-          </listitem>
+        <listitem>
+          <para>Preconditions:</para>
 
-          <listitem>
-            <para>Running procedures:</para>
-            
-            <itemizedlist spacing="compact">
-                <listitem>
-                  <para>The <literal>ansible-playbook</literal> commands for
-                  setup the configuration</para>
-                </listitem>
-
-                <listitem>
-                  <para>Testing the configuration</para>
-                </listitem>
-
-                <listitem>
-                  <para>Cleaning up the configuration</para>
-                </listitem>
-              </itemizedlist>
-          </listitem>
-        </itemizedlist>
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para>The configuration files to be updated</para>
+            </listitem>
+
+            <listitem>
+              <para>The VNF images to be copied</para>
+            </listitem>
+
+            <listitem>
+              <para>The license file needed from the provider and added to a
+              specific path, etc.</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+
+        <listitem>
+          <para>Running procedures:</para>
+
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para>The <literal>ansible-playbook</literal> commands for setup
+              the configuration</para>
+            </listitem>
+
+            <listitem>
+              <para>Testing the configuration</para>
+            </listitem>
+
+            <listitem>
+              <para>Cleaning up the configuration</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </itemizedlist>
 
-      <para>The test scenarios have the <filename>variable.yml</filename> file that
-      contains the input parameters for the Playbooks. These variables can be
-      reused when the same setup is run on another device.</para>
+      <para>The test scenarios have the <filename>variable.yml</filename> file
+      that contains the input parameters for the Playbooks. These variables
+      can be reused when the same setup is run on another device.</para>
 
       <para><emphasis role="bold">Example:</emphasis></para>
 
@@ -1450,63 +1489,70 @@ vnfi_name: "fortigateFWInstance"</programlisting>
     <para>The <literal>unit-test</literal> suite is implemented in the
     <literal>unit_tests</literal> directory.</para>
 
-    <para>The <literal>unit-test</literal> suite contains the 
-    <literal>unit-test</literal> class defined in <filename>unittestSuite.py</filename>, and examples of JSON configuration
-    files that can be used for the execution of AF Python classes from the 
+    <para>The <literal>unit-test</literal> suite contains the
+    <literal>unit-test</literal> class defined in
+    <filename>unittestSuite.py</filename>, and examples of JSON configuration
+    files that can be used for the execution of AF Python classes from the
     <literal>automation_framework</literal> directory.</para>
 
     <para>The Python <literal>unit-test</literal> class defined in the
-    <filename>unittestSuite.py</filename> script provides a way to automate the execution of 
-      specific test cases for each supported Python script.</para>
+    <filename>unittestSuite.py</filename> script provides a way to automate
+    the execution of specific test cases for each supported Python
+    script.</para>
 
     <para>This class requires a test suite configuration JSON file that
-    contains a dictionary list of the Python scripts to be processed. Each dictionary contains the
-      path of the Python script to be loaded and the path to the file describing the test cases to
-      be performed against the designated script.</para>
+    contains a dictionary list of the Python scripts to be processed. Each
+    dictionary contains the path of the Python script to be loaded and the
+    path to the file describing the test cases to be performed against the
+    designated script.</para>
 
     <para>Python <literal>unit-test</literal> suite examples are in the
     <literal>unit_tests/scenario</literal> directory.</para>
 
     <para>Each scenario has 3 parts:</para>
-    
+
     <itemizedlist spacing="compact">
-        <listitem>
-          <para><literal>README</literal> - explains the prerequisites needed before running the
-            Python <literal>unit-test</literal> suite.</para>
-        </listitem>
+      <listitem>
+        <para><literal>README</literal> - explains the prerequisites needed
+        before running the Python <literal>unit-test</literal> suite.</para>
+      </listitem>
 
-        <listitem>
-          <para><literal>config</literal> - contains a JSON file for each
-          functionality that is used in the specified scenario. The JSON files have two keys:</para>
-          
-          <itemizedlist spacing="compact">
-              <listitem>
-                <para>name: The description of the functionality.</para>
-              </listitem>
+      <listitem>
+        <para><literal>config</literal> - contains a JSON file for each
+        functionality that is used in the specified scenario. The JSON files
+        have two keys:</para>
 
-              <listitem>
-                <para>args: The arguments of the Python module.</para>
-              </listitem>
-            </itemizedlist>
-        </listitem>
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>name: The description of the functionality.</para>
+          </listitem>
 
-        <listitem>
-          <para><literal>JSON</literal> - used for running the scenario. Each JSON file contains 
-            the calls to the JSON files from the <literal>config</literal> directory, and has two keys:</para>
-          
-          <itemizedlist spacing="compact">
-              <listitem>
-                <para>config: The JSON file from the <literal>config</literal> directory that is used.</para>
-              </listitem>
+          <listitem>
+            <para>args: The arguments of the Python module.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
 
-              <listitem>
-                <para>module: The Python module that is run.</para>
-              </listitem>
-            </itemizedlist>
-        </listitem>
-      </itemizedlist>
+      <listitem>
+        <para><literal>JSON</literal> - used for running the scenario. Each
+        JSON file contains the calls to the JSON files from the
+        <literal>config</literal> directory, and has two keys:</para>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>config: The JSON file from the <literal>config</literal>
+            directory that is used.</para>
+          </listitem>
+
+          <listitem>
+            <para>module: The Python module that is run.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+    </itemizedlist>
 
-    <para>Steps for running the Python unit-test suite on the Enea Edge Management application are
-    provided in the <literal>README</literal> file from scenario in use.</para>
+    <para>Steps for running the Python unit-test suite on the Enea Edge
+    Management application are provided in the <literal>README</literal> file
+    from scenario in use.</para>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-automation-user-guide/doc/book.xml b/doc/book-enea-edge-automation-user-guide/doc/book.xml
index 95547b6..3a28109 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/book.xml
+++ b/doc/book-enea-edge-automation-user-guide/doc/book.xml
@@ -8,9 +8,9 @@
   User Guide</title>
 
   <subtitle>Release Version <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+  xpointer="element(EneaEdge_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
diff --git a/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml b/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml
index 27979cc..517f165 100644
--- a/doc/book-enea-edge-automation-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-automation-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 Enea Edge Automation</title>
 
@@ -10,133 +10,133 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>Basic Setup</para>
-                
-                <figure>
-            <title>Lab setup overview for Basic Setup</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" contentwidth="600"
-                           fileref="images/environment_basicsetup.png" />
-              </imageobject>
-            </mediaobject>
-          </figure>
+
+        <figure>
+          <title>Lab setup overview for Basic Setup</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/environment_basicsetup.png" />
+            </imageobject>
+          </mediaobject>
+        </figure>
       </listitem>
 
       <listitem>
         <para>Chained VNFs Service</para>
-                
-                <figure>
-            <title>Lab Setup Overview for Chained VNFs Service</title>
-
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" contentwidth="600"
-                           fileref="images/ChainedVNFsService_setup.png" />
-              </imageobject>
-            </mediaobject>
-          </figure>
+
+        <figure>
+          <title>Lab Setup Overview for Chained VNFs Service</title>
+
+          <mediaobject>
+            <imageobject>
+              <imagedata align="center" contentwidth="600"
+                         fileref="images/ChainedVNFsService_setup.png" />
+            </imageobject>
+          </mediaobject>
+        </figure>
       </listitem>
     </itemizedlist>
 
-    <para>The following environment setup is needed for running the Enea Edge Automation
-    tests:</para>
+    <para>The following environment setup is needed for running the Enea Edge
+    Automation tests:</para>
 
     <itemizedlist>
       <listitem>
         <para>Lab Network Requirements:</para>
-                
-                <itemizedlist spacing="compact">
-            <listitem>
-              <para>DHCP enabled</para>
-            </listitem>
-
-            <listitem>
-              <para>Internet connectivity</para>
-            </listitem>
-          </itemizedlist>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>DHCP enabled</para>
+          </listitem>
+
+          <listitem>
+            <para>Internet connectivity</para>
+          </listitem>
+        </itemizedlist>
       </listitem>
 
       <listitem>
         <para>Enea Edge Management Host Requirements:</para>
-                
-                <itemizedlist spacing="compact">
-            <listitem>
-              <para>CentOS 7 installed</para>
-            </listitem>
-
-            <listitem>
-              <para>A connection to the Lab Network</para>
-            </listitem>
-
-            <listitem>
-              <para>The Enea Edge Management application installed. For details, see <olink
-              targetdoc="book_enea_edge_getting_started"
-              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_edge_getting_started/1)" /></olink>
-              Manual.</para>
-            </listitem>
-          </itemizedlist>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>CentOS 7 installed</para>
+          </listitem>
+
+          <listitem>
+            <para>A connection to the Lab Network</para>
+          </listitem>
+
+          <listitem>
+            <para>The Enea Edge Management application installed. For details,
+            see <olink targetdoc="book_enea_edge_getting_started"
+            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_edge_getting_started/1)" /></olink>
+            Manual.</para>
+          </listitem>
+        </itemizedlist>
       </listitem>
 
       <listitem>
         <para>uCPE device Requirements for Basic Setup:</para>
-                
-                <itemizedlist spacing="compact">
-            <listitem>
-              <para>Minimum of 4 Physical Network Devices</para>
-            </listitem>
-
-            <listitem>
-              <para>4GB RAM and 4 cores (Intel C3000 or Xeon D)</para>
-            </listitem>
-
-            <listitem>
-              <para>2 Physical connections to the Lab Network</para>
-            </listitem>
-
-            <listitem>
-              <para>Enea Edge Runtime installed. For more
-              details, see <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"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xpointer="element(book_enea_edge_getting_started/1)" /></olink>
-              Manual.</para>
-            </listitem>
-          </itemizedlist>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>Minimum of 4 Physical Network Devices</para>
+          </listitem>
+
+          <listitem>
+            <para>4GB RAM and 4 cores (Intel C3000 or Xeon D)</para>
+          </listitem>
+
+          <listitem>
+            <para>2 Physical connections to the Lab Network</para>
+          </listitem>
+
+          <listitem>
+            <para>Enea Edge Runtime installed. For more details, see <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"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(book_enea_edge_getting_started/1)" /></olink>
+            Manual.</para>
+          </listitem>
+        </itemizedlist>
       </listitem>
 
       <listitem>
         <para>uCPE device 1 and 2 Requirements for Chained VNFs
         Service:</para>
-                
-                <itemizedlist spacing="compact">
-            <listitem>
-              <para>Minimum of 4 Physical Network Devices</para>
-            </listitem>
-
-            <listitem>
-              <para>16GB RAM and 8 cores (Intel C3000 or Xeon D)</para>
-            </listitem>
-
-            <listitem>
-              <para>2 Physical connections to the Lab Network</para>
-            </listitem>
-
-            <listitem>
-              <para>1 Physical connection back to back between both uCPE
-              devices</para>
-            </listitem>
-
-            <listitem>
-              <para>Enea Edge Runtime installed</para>
-            </listitem>
-          </itemizedlist>
+
+        <itemizedlist spacing="compact">
+          <listitem>
+            <para>Minimum of 4 Physical Network Devices</para>
+          </listitem>
+
+          <listitem>
+            <para>16GB RAM and 8 cores (Intel C3000 or Xeon D)</para>
+          </listitem>
+
+          <listitem>
+            <para>2 Physical connections to the Lab Network</para>
+          </listitem>
+
+          <listitem>
+            <para>1 Physical connection back to back between both uCPE
+            devices</para>
+          </listitem>
+
+          <listitem>
+            <para>Enea Edge Runtime installed</para>
+          </listitem>
+        </itemizedlist>
       </listitem>
     </itemizedlist>
   </section>
@@ -154,125 +154,127 @@
 
       <listitem>
         <para>EPEL Repository</para>
-                
-                <programlisting>sudo yum install epel-release</programlisting>
+
+        <programlisting>sudo yum install epel-release</programlisting>
       </listitem>
 
       <listitem>
         <para>PIP package manager</para>
-                
-                <programlisting>sudo yum -y install python-pip</programlisting>
+
+        <programlisting>sudo yum -y install python-pip</programlisting>
       </listitem>
 
       <listitem>
         <para>Virtualenv tool</para>
-                
-                <programlisting>sudo pip install virtualenv</programlisting>
+
+        <programlisting>sudo pip install virtualenv</programlisting>
       </listitem>
     </itemizedlist>
 
     <note>
-      <para>It is recommended to install Enea Edge Automation and the Enea Edge Management application
-      on different machines.</para>
+      <para>It is recommended to install Enea Edge Automation and the Enea
+      Edge Management application on different machines.</para>
     </note>
   </section>
 
   <section id="initial_setup">
     <title>Installing the Enea Edge Automation</title>
 
-    <para id="install_procedure"><emphasis role="bold">Installing the
-    Enea Edge Automation</emphasis></para>
-        
-        <orderedlist>
-        <listitem>
-          <para>Log into the host machine</para>
-        </listitem>
-
-        <listitem>
-          <para><programlisting>cd &lt;AF-installdir&gt;</programlisting></para>
-        </listitem>
-
-        <listitem>
-          <para>Extract the archive file</para>
-                  
-                  <programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Run the setup of virtual environment script:</para>
-                  
-                  <programlisting>source setup_env.sh</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Configure the system. For more details, see <xref
-          linkend="AFTH_cofig" />.</para>
-        </listitem>
-      </orderedlist>
-          
-          <note>
-        <para>The steps are executed only once, for the initial setup of the
-        environment.</para>
-      </note>
-
-    <para><emphasis role="bold">Setting up the enviroment for the Enea Edge Automation</emphasis></para>
-        
-        <orderedlist>
-        <listitem>
-          <para>Activate the Python virtual enviroment</para>
-
-          <programlisting>source &lt;AF-installdir&gt;/testHarness-venv/bin/activate</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Optionally, check the History Information</para>
-
-          <programlisting>vi &lt;AF-installdir&gt;/CHANGELOG</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Close the Python virtual environment</para>
-
-          <programlisting>deactivate</programlisting>
-        </listitem>
-      </orderedlist>
+    <para id="install_procedure"><emphasis role="bold">Installing the Enea
+    Edge Automation</emphasis></para>
+
+    <orderedlist>
+      <listitem>
+        <para>Log into the host machine</para>
+      </listitem>
+
+      <listitem>
+        <para><programlisting>cd &lt;Automation-installdir&gt;</programlisting></para>
+      </listitem>
+
+      <listitem>
+        <para>Extract the archive file</para>
+
+        <programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>Run the setup of virtual environment script:</para>
+
+        <programlisting>source setup_env.sh</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>Configure the system. For more details, see <xref
+        linkend="AFTH_cofig" />.</para>
+      </listitem>
+    </orderedlist>
+
+    <note>
+      <para>The steps are executed only once, for the initial setup of the
+      environment.</para>
+    </note>
+
+    <para><emphasis role="bold">Setting up the enviroment for the Enea Edge
+    Automation</emphasis></para>
+
+    <orderedlist>
+      <listitem>
+        <para>Activate the Python virtual enviroment</para>
+
+        <programlisting>source &lt;Automation-installdir&gt;/testHarness-venv/bin/activate</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>Optionally, check the History Information</para>
+
+        <programlisting>vi &lt;Automation-installdir&gt;/CHANGELOG</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>Close the Python virtual environment</para>
+
+        <programlisting>deactivate</programlisting>
+      </listitem>
+    </orderedlist>
   </section>
 
   <section id="upgrade_AF">
     <title>Upgrading the Enea Edge Automation</title>
 
-    <para><emphasis role="bold">Upgrading the Enea Edge Automation</emphasis></para>
-        
-        <orderedlist>
-        <listitem>
-          <para>Log into the host machine</para>
-        </listitem>
-
-        <listitem>
-          <para><programlisting>cd &lt;AF-installdir&gt;</programlisting></para>
-        </listitem>
-
-        <listitem>
-          <para>Back up the configuration files from
-          <literal>modules/enea/config</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Extract the archive file:</para>
-                  
-                  <programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>Restore the configuration files from step 2 into
-          <literal>modules/enea/config </literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Run the setup of virtual environment script:</para>
-                  
-                  <programlisting>source setup_env.sh</programlisting>
-        </listitem>
-      </orderedlist>
+    <para><emphasis role="bold">Upgrading the Enea Edge
+    Automation</emphasis></para>
+
+    <orderedlist>
+      <listitem>
+        <para>Log into the host machine</para>
+      </listitem>
+
+      <listitem>
+        <para><programlisting>cd &lt;Automation-installdir&gt;</programlisting></para>
+      </listitem>
+
+      <listitem>
+        <para>Back up the configuration files from
+        <literal>modules/enea/config</literal>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Extract the archive file:</para>
+
+        <programlisting>unzip Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</programlisting>
+      </listitem>
+
+      <listitem>
+        <para>Restore the configuration files from step 2 into
+        <literal>modules/enea/config </literal>.</para>
+      </listitem>
+
+      <listitem>
+        <para>Run the setup of virtual environment script:</para>
+
+        <programlisting>source setup_env.sh</programlisting>
+      </listitem>
+    </orderedlist>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-example-usecases/doc/book.xml b/doc/book-enea-edge-example-usecases/doc/book.xml
index fc69b88..e872c95 100644
--- a/doc/book-enea-edge-example-usecases/doc/book.xml
+++ b/doc/book-enea-edge-example-usecases/doc/book.xml
@@ -8,9 +8,9 @@
   Use-cases</title>
 
   <subtitle>Release Version <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+  xpointer="element(EneaEdge_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
diff --git a/doc/book-enea-edge-getting-started/doc/book.xml b/doc/book-enea-edge-getting-started/doc/book.xml
index 07021cb..f317f15 100644
--- a/doc/book-enea-edge-getting-started/doc/book.xml
+++ b/doc/book-enea-edge-getting-started/doc/book.xml
@@ -8,9 +8,9 @@
   Started</title>
 
   <subtitle>Release Version <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+  xpointer="element(EneaEdge_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
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 5f265fb..39ef10a 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
@@ -580,9 +580,9 @@
 
         <listitem>
           <para>DeviceVersion: <xi:include
-          href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+          href="../../eltf_params_updated.xml"
           xmlns:xi="http://www.w3.org/2001/XInclude"
-          xpointer="element(EneaLinux_REL_VER/1)" /></para>
+          xpointer="element(EneaEdge_REL_VER/1)" /></para>
         </listitem>
 
         <listitem>
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 e13cd41..350852b 100644
--- a/doc/book-enea-edge-management-open-source/doc/about.xml
+++ b/doc/book-enea-edge-management-open-source/doc/about.xml
@@ -7,7 +7,7 @@
   <para>This document contains the open source and license information
   pertaining to packages relating to the Enea Edge Management application
   provided with Enea Edge <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+  xpointer="element(EneaEdge_REL_VER/1)" />.</para>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-management-open-source/doc/book.xml b/doc/book-enea-edge-management-open-source/doc/book.xml
index 715fbe6..cb63551 100644
--- a/doc/book-enea-edge-management-open-source/doc/book.xml
+++ b/doc/book-enea-edge-management-open-source/doc/book.xml
@@ -6,7 +6,7 @@
 <book id="book_enea_edge_management_open_source">
   <title><trademark class="registered">Enea</trademark> Edge Management Open Source Report</title>
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></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" />
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 349c955..2260bce 100644
--- a/doc/book-enea-edge-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -12,9 +12,9 @@
     private or public cloud.</para>
 
   <para>The Enea Edge <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes new features, 
+  xpointer="element(EneaEdge_REL_VER/1)" /> Release includes new features, 
     optimizations, corrections, and updates to the user documentation.. 
     A list of major new features and improvements can be found in  
     <xref linkend="relinfo-changes-other">Section 2.1 New Features and Improvements</xref>.</para>
@@ -103,7 +103,7 @@
   it is in the beginning. The subtitles shall have the directory name of the
   target in the manifest.</remark>
 
-  <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  <xi:include href="../../eltf_params_updated.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude"
               xpointer="element(eltf-target-tables-section)" />
 
diff --git a/doc/book-enea-edge-release-info/doc/book.xml b/doc/book-enea-edge-release-info/doc/book.xml
index 0b77f41..6897c6f 100644
--- a/doc/book-enea-edge-release-info/doc/book.xml
+++ b/doc/book-enea-edge-release-info/doc/book.xml
@@ -8,9 +8,9 @@
   Information</title>
 
   <subtitle>Release Version <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /></subtitle>
+  xpointer="element(EneaEdge_REL_VER/1)" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
 
diff --git a/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml
deleted file mode 100644
index 9eecd3c..0000000
--- a/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="relinfo-getting-enea-nfv-access">
-  <title>Getting Enea NFV Access</title>
-
-  <para>Enea NFV Access releases and updates are available as binaries ready
-  for download.</para>
-
-  <para><emphasis role="bold">Downloading Enea NFV Access</emphasis></para>
-<remark>Does the content below need to be revised to no longer make reference or mention to Enea Portal?</remark>
-  <orderedlist>
-    <listitem>
-      <para>Log in to the link above using the credentials provided by
-      Enea.</para>
-    </listitem>
-
-    <listitem>
-      <para>From the right corner of the top main menu, choose the
-      <literal>Access</literal> section.</para>
-    </listitem>
-
-    <listitem>
-      <para>The <literal>Files</literal> section on the left will display each
-      official release of Enea NFV Access, with the latest at the top.</para>
-
-      <para>Each release listing displays the dates for release and updates
-      available, along with a <literal>Download</literal> button that allows
-      you to directly save the version you wish to use.</para>
-    </listitem>
-
-    <listitem>
-      <para>By clicking on the link at the top of any listing of Enea NFV
-      Access, you'll access the changelog page for that version. At the bottom
-      of the page are clearly labeled region-specific zip files containing the
-      binary sources.</para>
-
-      <para>Documentation is also available at the bottom of the page.</para>
-    </listitem>
-
-    <listitem>
-      <para>On the right side of the main <literal>Access</literal> page is
-      the <literal>Online Documentation</literal> section, listing pdfs for
-      the latest versions of documentation. They can all be accessed for
-      indiviudual downloading without the need to download the binaries
-      first.</para>
-    </listitem>
-  </orderedlist>
-
-  <para>For details about the books delivered and their purpose, refer to
-  <xref linkend="relinfo-documentation" />. For information concerning the
-  contents of the release package, please see <xref
-  linkend="release-content" />.</para>
-</chapter>
diff --git a/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml b/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml
deleted file mode 100644
index b0317b3..0000000
--- a/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<chapter id="sys-req-prerequisites">
-  <title>Host Requirements</title>
-
-  <para>Using Enea NFV Access or compiling applications requires certain
-  packages to be installed on your build host. The requirements listed below
-  are extensive to allow getting Enea NFV Access to be booted on target
-  machines and for building applications.</para>
-
-  <informaltable>
-    <tgroup cols="2">
-      <colspec align="left" colname="1" colwidth="1*" />
-
-      <colspec align="left" colname="2" colwidth="3*" />
-
-      <spanspec nameend="2" namest="1" spanname="onetwo" />
-
-      <tbody>
-        <row>
-          <entry spanname="onetwo"><emphasis role="bold"> Build Host
-          Requirements<indexterm>
-              <primary>host requirements</primary>
-            </indexterm></emphasis></entry>
-        </row>
-
-        <row>
-          <entry>Linux distribution</entry>
-
-          <entry>The downloaded product can installed on the target machine
-          using a Linux host. For information about supported hosts and
-          targets, see <xref
-          linkend="relinfo-supported-host-environment" />.</entry>
-        </row>
-
-        <row>
-          <entry>Packages</entry>
-
-          <entry>Depending on the Linux distribution and version of the host,
-          certain packages may be required. See details on what packages are
-          needed and how to install them in the following sections.</entry>
-        </row>
-
-        <row>
-          <entry>Disk space</entry>
-
-          <entry>Your build host should have at least 50 GB of free disk space
-          for installing the SDK, eSDK or cross-compiling
-          applications.</entry>
-        </row>
-
-        <row>
-          <entry>Recommended RAM</entry>
-
-          <entry>Your build host must have at least 4 GB available
-          RAM.</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </informaltable>
-</chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-runtime-open-source/doc/about.xml b/doc/book-enea-edge-runtime-open-source/doc/about.xml
index 94136a3..d1e04b4 100644
--- a/doc/book-enea-edge-runtime-open-source/doc/about.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/about.xml
@@ -7,7 +7,7 @@
   <para>This document contains the open source and license information
   pertaining to packages relating to the Enea Edge Runtime and the Installer
   provided with Enea Edge <ns:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
-  xpointer="element(EneaLinux_REL_VER/1)"
+  href="../../eltf_params_updated.xml"
+  xpointer="element(EneaEdge_REL_VER/1)"
   xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-runtime-open-source/doc/book.xml b/doc/book-enea-edge-runtime-open-source/doc/book.xml
index a575375..4e2ecf2 100644
--- a/doc/book-enea-edge-runtime-open-source/doc/book.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/book.xml
@@ -6,7 +6,7 @@
 <book id="book_enea_edge_runtime_open_source">
   <title><trademark class="registered">Enea</trademark> Edge Runtime Open Source Report</title>
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></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" />
diff --git a/doc/book-enea-edge-system-test-specification/doc/book.xml b/doc/book-enea-edge-system-test-specification/doc/book.xml
index bcc2dcd..0884348 100644
--- a/doc/book-enea-edge-system-test-specification/doc/book.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/book.xml
@@ -7,7 +7,7 @@
   <title><trademark class="registered">Enea</trademark> Edge System Test Specification</title>
 
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/about.xml b/doc/book-enea-edge-telemetry-open-source/doc/about.xml
index 443bf36..3c64d62 100644
--- a/doc/book-enea-edge-telemetry-open-source/doc/about.xml
+++ b/doc/book-enea-edge-telemetry-open-source/doc/about.xml
@@ -6,7 +6,7 @@
 
   <para>This document contains the open source and license information
   pertaining to Telemetry packages provided with Enea Edge <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" />.</para>
+  xpointer="element(EneaEdge_REL_VER/1)" />.</para>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/book.xml b/doc/book-enea-edge-telemetry-open-source/doc/book.xml
index 9b0aa33..0c54870 100644
--- a/doc/book-enea-edge-telemetry-open-source/doc/book.xml
+++ b/doc/book-enea-edge-telemetry-open-source/doc/book.xml
@@ -6,7 +6,7 @@
 <book id="book_enea_edge_telemetry_open_source">
   <title><trademark class="registered">Enea</trademark> Edge Telemetry Open Source Report</title>
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></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" />
diff --git a/doc/book-enea-nfv-access-evalkit/doc/book.xml b/doc/book-enea-nfv-access-evalkit/doc/book.xml
index 90399a7..68b36af 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/book.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/book.xml
@@ -7,7 +7,7 @@
   <title><trademark class="registered">Enea</trademark> NFV Access Evaluation Kit</title>
 
   <subtitle>Release Version
-         <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../eltf_params_updated.xml" xpointer="element(EneaEdge_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
 
   <!-- OLINKDBPATH_USED_BY_XMLMIND ../../s_docbuild/olinkdb  -->
diff --git a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
index fca409c..7204f7b 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-evalkit/doc/prerequisites.xml
@@ -153,10 +153,10 @@
       </listitem>
     </itemizedlist>
 
-    <para>See the Enea NFV Access <xi:include
-  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+    <para>See the Enea Edge <xi:include
+  href="../../eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
-  xpointer="element(EneaLinux_REL_VER/1)" /> Release Information for more
+  xpointer="element(EneaEdge_REL_VER/1)" /> Release Information Manual for more
     details.</para>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/eltf_params_template.xml b/doc/eltf_params_template.xml
new file mode 100644
index 0000000..8a05079
--- /dev/null
+++ b/doc/eltf_params_template.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<section id="eltf_created_params">
+  <title>File with Parameters in the Book Auto-updated by ELFT</title>
+
+  <note>
+    <para>See the <emphasis
+    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
+    file for description of how to create the final <emphasis
+    role="bold">eltf_params_updated.xml</emphasis> from this template and for
+    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
+    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
+    ELTF variables, which always begins with ELTF_ and don't only rely on the
+    howto text file list! The plan is that ELTF will auto-update this when
+    needed.</para>
+  </note>
+
+  <section id="host_prereq">
+    <title>Common Parameters</title>
+
+    <bridgehead>A programlisting, ID
+    "eltf-prereq-apt-get-commands-host"</bridgehead>
+
+    <para id="eltf-prereq-apt-get-commands-host"><programlisting>ELTF_PL_HOST_PREREQ</programlisting></para>
+
+    <bridgehead>A programlisting, ID
+    "eltf-getting-repo-install-command"</bridgehead>
+
+    <para id="eltf-getting-repo-install-command"><programlisting>ELTF_PL_GET_REPO</programlisting></para>
+
+    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
+    correct also compared to the "previous" REL VER in pardoc-distro.xml
+    "prev_baseline".</bridgehead>
+
+    <para id="EneaEdge_REL_VER"><phrase>ELTF_EL_REL_VER</phrase></para>
+
+    <para id="Yocto_VER"><phrase>ELTF_YOCTO_VER</phrase></para>
+
+    <para id="Yocto_NAME"><phrase>ELTF_YOCTO_NAME</phrase></para>
+
+    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
+    url="ELTF_YOCTO_PROJ_DOWNLOAD_URL">ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL</ulink></para>
+
+    <para id="ULINK_ENEA_LINUX_URL"><ulink
+    url="ELTF_EL_DOWNLOAD_URL">ELTF_EL_DOWNLOAD_TXTURL</ulink></para>
+
+    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
+    $MACHINE/default.xml as parameter, where MACHINE is one of the target
+    directory names in the manifest.</bridgehead>
+
+    <para id="eltf-repo-cloning-enea-linux"><programlisting>ELTF_PL_CLONE_W_REPO</programlisting></para>
+
+    <bridgehead>A table with ONE row, only the row with ID
+    "eltf-eclipse-version-row" is included in the book. MANUALLY BOTH in the
+    template.xml and in the updated.xml, set condition hidden on the
+    &lt;row&gt;, if eclipse is not in the release.</bridgehead>
+
+    <informaltable>
+      <tgroup cols="1">
+        <tbody>
+          <row id="eltf-eclipse-version-row">
+            <entry>Eclipse version ELTF_ECLIPSE_VERSION plus command line
+            development tools are included in this Enea Linux release.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+
+    <bridgehead>Below is one big section with title "Supported Targets with
+    Parameters". The entire section is included completely in the book via ID
+    "eltf-target-tables-section" and shall be LAST in the template. The
+    template contains ONE target subsection. COPY/APPEND it, if multiple
+    targets exist in the release and optionally add rows with additional
+    target parameters in each target subsection table.</bridgehead>
+  </section>
+
+  <section id="eltf-target-tables-section">
+    <title>Supported Targets with Parameters</title>
+
+    <para>The tables below describes the target(s) supported in this Enea
+    Linux release.</para>
+
+    <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
+      <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
+
+      <para><informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="6*" />
+
+            <colspec colwidth="9*" />
+
+            <tbody>
+              <row>
+                <entry>Target official name</entry>
+
+                <entry>ELTF_T_NAME</entry>
+              </row>
+
+              <row>
+                <entry>Architecture and Description</entry>
+
+                <entry>ELTF_T_ARC_DESC</entry>
+              </row>
+
+              <row>
+                <entry>Link to target datasheet</entry>
+
+                <entry>See <ulink
+                url="ELTF_T_DS_URL">ELTF_T_DS_TXTURL</ulink></entry>
+              </row>
+
+              <row>
+                <entry>Poky version</entry>
+
+                <entry>ELTF_T_POKY_VER</entry>
+              </row>
+
+              <row>
+                <entry>GCC version</entry>
+
+                <entry>ELTF_T_GCC_VER</entry>
+              </row>
+
+              <row>
+                <entry>Linux Kernel Version</entry>
+
+                <entry>ELTF_T_KERN_VER</entry>
+              </row>
+
+              <row>
+                <entry>Supported Drivers</entry>
+
+                <entry>ELTF_T_DRIVERS</entry>
+              </row>
+
+              <row>
+                <entry>Enea rpm folder for downloading RPM packages for this
+                target</entry>
+
+                <entry><ulink
+                url="ELTF_T_EL_RPM_URL">ELTF_T_EL_RPM_TXTURL</ulink></entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable></para>
+    </section>
+
+    <!-- ELTFADD_MORE_TARGET_SECTIONS_BELOW_IF_NEEDED -->
+  </section>
+</section>
\ No newline at end of file
diff --git a/doc/eltf_params_updated.xml b/doc/eltf_params_updated.xml
new file mode 100644
index 0000000..34739ee
--- /dev/null
+++ b/doc/eltf_params_updated.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<section id="eltf_created_params">
+  <title>File with Parameters in the Book Auto-updated by ELFT</title>
+
+  <note>
+    <para>See the <emphasis
+    role="bold">eltf_params_updated_template_howto_use.txt</emphasis> text
+    file for description of how to create the final <emphasis
+    role="bold">eltf_params_updated.xml</emphasis> from this template and for
+    all <emphasis role="bold">REQUIREMENTS</emphasis>. Use the command
+    "<emphasis role="bold">make eltf</emphasis>" to extract a full list of all
+    ELTF variables, which always begins with ELTF_ and don't only rely on the
+    howto text file list! The plan is that ELTF will auto-update this when
+    needed.</para>
+  </note>
+
+  <section id="host_prereq">
+    <title>Common Parameters</title>
+
+    <bridgehead>A programlisting, ID
+    "eltf-prereq-apt-get-commands-host"</bridgehead>
+
+    <para id="eltf-prereq-apt-get-commands-host"><programlisting># Host Ubuntu 16.04 LTS 64bit
+sudo apt-get -y update
+sudo apt-get -y install sed wget subversion git-core coreutils unzip texi2html \
+   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
+   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
+   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
+   libxml-parser-perl</programlisting></para>
+
+    <bridgehead>A programlisting, ID
+    "eltf-getting-repo-install-command"</bridgehead>
+
+    <para id="eltf-getting-repo-install-command"><programlisting>mkdir -p ~/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo &gt; ~/bin/repo
+chmod a+x ~/bin/repo
+export PATH=~/bin:$PATH</programlisting></para>
+
+    <bridgehead>Several phrase elements, various IDs. Ensure EL_REL_VER is
+    correct also compared to the "previous" REL VER in pardoc-distro.xml
+    "prev_baseline".</bridgehead>
+
+    <para id="EneaEdge_REL_VER"><phrase>2.5.0</phrase></para>
+
+    <para id="ENA_BUILD_VER"><phrase>1</phrase></para>
+
+    <para id="Yocto_VER"><phrase>2.4</phrase></para>
+
+    <para id="Yocto_NAME"><phrase>rocko</phrase></para>
+
+    <para id="ULINK_YOCTO_PROJECT_DOWNLOAD"><ulink
+    url="http://www.yoctoproject.org/downloads">http://www.yoctoproject.org/downloads</ulink></para>
+
+    <para id="ULINK_ENEA_LINUX_URL"><ulink
+    url="https://linux.enea.com/6">https://linux.enea.com/6</ulink></para>
+
+    <bridgehead>A programlisting, ID "eltf-repo-cloning-enea-linux". Use
+    $MACHINE/default.xml as parameter, where MACHINE is one of the target
+    directory names in the manifest.</bridgehead>
+
+    <para id="eltf-repo-cloning-enea-linux"><programlisting>mkdir enea-linux
+cd enea-linux
+repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
+    -b refs/tags/EL6 -m $MACHINE/default.xml
+repo sync</programlisting></para>
+
+    <bridgehead>A table with ONE row, only the row with ID
+    "eltf-eclipse-version-row" is included in the book. MANUALLY in book, set
+    condition hidden if eclipse is not in the release. Do this both in
+    template.xml and updated.xml.</bridgehead>
+
+    <informaltable>
+      <tgroup cols="1">
+        <tbody>
+          <row condition="hidden" id="eltf-eclipse-version-row">
+            <entry>Eclipse version 4.3 (Mars) plus command line development
+            tools are included in this Enea Edge release.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </informaltable>
+
+    <bridgehead>Below is one big section with title "Supported Processor with
+    Parameters". The entire section is included completely in the book via ID
+    "eltf-target-tables-section" and shall be LAST in the template. The
+    template contains ONE target subsection. COPY/APPEND it, if multiple
+    targets exist in the release and optionally add rows with additional
+    target parameters in each target subsection table.</bridgehead>
+  </section>
+
+  <section id="eltf-target-tables-section">
+    <title>Reference Processors with Parameters</title>
+
+    <para>The table(s) below describes the tested processors for this Enea
+    Edge release.</para>
+
+    <table>
+      <title>Processor Product Family Information - Intel Xeon D-1500</title>
+
+      <tgroup cols="2">
+        <colspec align="left" />
+
+        <thead>
+          <row>
+            <entry align="center">Component</entry>
+
+            <entry align="center">Description</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry>Processor official product family name</entry>
+
+            <entry>Intel Xeon D-1500 (Broadwell)</entry>
+          </row>
+
+          <row>
+            <entry>Architecture and Description</entry>
+
+            <entry>x86-64</entry>
+          </row>
+
+          <row>
+            <entry>Link to processor datasheet</entry>
+
+            <entry><ulink
+            url="https://www.intel.com/content/www/us/en/processors/xeon/xeon-d-1500-datasheet-vol-1.html">Intel's
+            datasheet</ulink></entry>
+          </row>
+
+          <row condition="hidden">
+            <entry>Supported Drivers</entry>
+
+            <entry>Ethernet, RTC, UART</entry>
+          </row>
+
+          <row>
+            <entry>Tested Whiteboxes</entry>
+
+            <entrytbl cols="1">
+              <tbody>
+                <row>
+                  <entry>Supermicro X10SDV-4C-TLN2F (Intel Xeon
+                  D-1521)</entry>
+                </row>
+
+                <row>
+                  <entry>Kontron ME1100 (Intel Xeon D-1548).</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+
+    <table>
+      <title>Processor Product Family Information - Intel Atom C3000</title>
+
+      <tgroup cols="2">
+        <colspec align="left" />
+
+        <thead>
+          <row>
+            <entry align="center">Component</entry>
+
+            <entry align="center">Description</entry>
+          </row>
+        </thead>
+
+        <tbody>
+          <row>
+            <entry>Processor official product family name</entry>
+
+            <entry>Intel Atom C3000 (Denverton)</entry>
+          </row>
+
+          <row>
+            <entry>Architecture and Description</entry>
+
+            <entry>x86-64</entry>
+          </row>
+
+          <row>
+            <entry>Link to the processor datasheet</entry>
+
+            <entry><ulink
+            url="https://www.intel.com/content/www/us/en/products/docs/processors/atom/c-series/c3000-family-datasheet.html">Intel's
+            datasheet</ulink></entry>
+          </row>
+
+          <row condition="hidden">
+            <entry>Supported Drivers</entry>
+
+            <entry>Ethernet, RTC, UART</entry>
+          </row>
+
+          <row>
+            <entry>Tested Whiteboxes</entry>
+
+            <entrytbl cols="1">
+              <tbody>
+                <row>
+                  <entry>Dell EMC Networking VEP1445 (Intel Atom
+                  C3758)</entry>
+                </row>
+
+                <row>
+                  <entry>Advantech FWA-1012VCR-4CA1S (Intel Atom
+                  C3558)</entry>
+                </row>
+
+                <row>
+                  <entry>Advantech FWA-1112VCL-2CA1S (Intel Atom
+                  C3558-4C)</entry>
+                </row>
+
+                <row>
+                  <entry>Supermicro A2SDi-TP8F (Intel Atom C3858)</entry>
+                </row>
+
+                <row>
+                  <entry>Supermicro SuperServer 5019A-12TN4 (Intel Atom
+                  C3850)</entry>
+                </row>
+
+                <row>
+                  <entry>Silicom C3000 (Intel Atom 3558)</entry>
+                </row>
+              </tbody>
+            </entrytbl>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </section>
+</section>
\ No newline at end of file
diff --git a/doc/eltf_params_updated_template_how_to_use.txt b/doc/eltf_params_updated_template_how_to_use.txt
new file mode 100644
index 0000000..97b07aa
--- /dev/null
+++ b/doc/eltf_params_updated_template_how_to_use.txt
@@ -0,0 +1,320 @@
+eltf_params_template_updated_howto_use.txt
+
+This is a way to collect all parameters for an Enea Edge release
+in one parameter file, easy to automatically update by ELTF regularly.
+
+NOTE: Both the release info AND the open source books use parameters from
+      here, but the XML file is inside the release info book directory.
+
+NOTE: The manifest_conf.mk, or overridden by the environment variable
+      MANIFESTHASH, contains the full tag (or hashvalue) for downloading
+      the manifest when the books are built. The list of target
+      directories are fetched from the manifest into the book.
+      The eltf_params_updates.xml can all the time contain
+      the final next complete tag e.g. refs/tags/EL6 or similar
+      in the ELTF_PL_CLONE_W_REPO parameter command lines.
+
+The ordinary book XML files use xi:include statements to include elements
+from this parameter file. The book XML files can thus be manually edited.
+Before editing, you must run "make init".
+Any other text in the template or updated.xml file, outside the parts that
+are included in the book, are not used but still all must be correct
+DocBook XML files.
+
+ELTF work:
+ template => ELTF replaces ALL ELTF_xxx variables => updated XML file
+    => push to git only if changed
+
+
+eltf_params_template.xml  (in git)
+   File used by ELTF to autocreate/update the real parameter
+   file eltf_params_updated.xml.
+
+eltf_params_updated.xml  (in git)
+   Real parameter file where ELTF has replaced all ELTF_xx variables with
+   strings, in several cases with multiline strings.
+   No spaces or linefeed allowed in beginning or end of the variable values!
+
+
+xi:include: Each parameter is xi:include'ed in various book files, using
+   the IDs existing in the parameter files.
+   In most cases the 1:st element inside an element with an ID is included
+   using a format like eltf-prereq-apt-get-commands-host/1.
+   In very few cases the element with the ID is included in the book, one
+   example is the target section which has an ID, but which contains
+   multiple subsections, one per target.
+   All IDs in a book must be unique.
+
+DocBook XML: All XML files must be correct DocBook XML files.
+
+Do NOT edit/save the real *updated.xml file with XMLmind to avoid changes
+   not done by ELTF. But it is OK to open the real file in XMLmind to
+   check that the format is correct.
+
+ELTF should autocreate a temporary "real" file but only replace
+   and push the eltf_params_updated.xml if it is changed.
+
+
+make eltf
+   This lists all ELTF_xxx variables and some rules how to treat them
+
+DocBook Format: All elements - rules:
+   Several strict generic XML rules apply for all strings:
+    1. No TABs allowed or any other control chr than "linefeed"
+    2. Only 7-bit ASCII
+    3. Any < > & must be converted to &lt; &gt; and &amp;
+       Similar for any other non-7-bit-ASCII but avoid those!
+    4. No leading spaces or linefeeds when replacing the ELTF_* variable
+    5. No trailing spaces or linefeeds when replacing the ELTF_* variable
+    6. Note: Keep existing spaces before/efter ELTF_* in a few cases.
+
+DocBook Format: <programlisting> - rules: ELTF*PL* variables
+   Several strict rules apply for the multiline string in programlisting
+   in addition to the general XML rules above:
+    7. Max line length < 80 char
+    8. Use backslash (\) to break longer lines
+    9. Use spaces (e.g. 4) to indent continuation lines in programlistings
+   10. No trailing spaces on any line
+   11. No spaces or linefeed immediately after leading <programlisting>
+   12. No spaces or linefeed before trailing </programlisting>
+
+DocBook Format: <ulink> - rules: ELTF_*URL* variables
+   13. ELTF_*URL and corresponding ELTF_*TXTURL shall be identical strings
+   14. Only if the URL is extremely long, the TXTURL can be a separate string
+
+Each target has one section with target parameters:
+       <section id="eltf-target-table-ELTF_T_MANIFEST_DIR">
+        <title>MACHINE ELTF_T_MANIFEST_DIR - Information</title>
+          ..... with many ELTF_ variables ....
+       </section>
+
+   15. If there is only one target. ELTF just replaces ELTF parameters
+
+   16. It there are multiple targets. ELTF copies the section and appends the
+       section the required number of times.
+       Each section ID will become unique: eltf-target-table-ELTF_T_MANIFEST_DIR
+       Each section title will become unique
+
+Tables with target parameters in each target section:
+   17. It is possible for ELTF to append more rows with one parameter each
+       to these tables, because the entire tables are included in the book
+
+Special - NOT YET READY DEFINED how to handle the optionally included
+   Eclipse and its version, but this is a first suggestion:
+   18. Just now ELTF can define ELFT_ECLIPSE_VERSION as a full string
+       with both version number and name,
+   19. MANUALLY if Eclipse is NOT included in the release,
+       the release manager should manually set condition="hidden" on
+       the entire section in the book XML about Eclipse
+
+
+
+BELOW WE TRY TO EXPLAIN EACH ELTF_* variable, but always check with make eltf
+if there are more new variables, missing in this description file.
+
+_____________________________________________________________________________
+ELTF_PL_HOST_PREREQ       Multiline list of host prerequisites, e.g. commands
+                          like sudo apt-get install xxxx or similar.
+                          First line = comment with the complete host name!
+                          It is possible to include multiple hosts by just
+                          adding an empty line, comment with host name, etc.
+                          xi:include eltf-prereq-apt-get-commands-host/1
+                          This is a <programlisting>...</programlisting>
+                          Example:
+# Host Ubuntu 14.04.5 LTS 64bit
+sudo apt-get update
+sudo apt-get install sed wget subversion git-core coreutils unzip texi2html \
+   texinfo libsdl1.2-dev docbook-utils fop gawk python-pysqlite2 diffstat \
+   make gcc build-essential xsltproc g++ desktop-file-utils chrpath  \
+   libgl1-mesa-dev libglu1-mesa-dev autoconf automake groff libtool xterm \
+   libxml-parser-perl
+
+_____________________________________________________________________________
+ELTF_PL_GET_REPO          Multiline commands to download the repo tool
+                          xi:include eltf-getting-repo-install-command/1
+                          This is a <programlisting>...</programlisting>
+                          Example:
+mkdir -p ~/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
+chmod a+x ~/bin/repo
+export PATH=~/bin:$PATH
+
+_____________________________________________________________________________
+ELTF_EL_REL_VER           General parameter string: The version of this Enea
+                          NFV Access release. Major version and optional .Minor
+                          Typically created from MAJOR and MINOR in enea.conf
+                          MINOR in enea.conf is empty or contains a dot+minor
+                          xi_include EneaEdge_REL_VER/1
+                          This is a <phrase>X.x</phrase> used in many places.
+                          Examples:
+6
+  or
+6.1
+
+_____________________________________________________________________________
+ELTF_YOCTO_VER            General parameter string: Yocto version, created
+                          from DISTRO in poky.ent
+                          xi:include Yocto_VER/1
+                          This is a <phrase>X.x</phrase> used in many places.
+                          Example:
+2.1
+
+_____________________________________________________________________________
+ELTF_YOCTO_NAME           General parameter string: Yocto name (branch), created
+                          from DISTRO_NAME_NO_CAP in poky.ent
+                          xi:include Yocto_NAME/1
+                          This is a <phrase>X.x</phrase> used in many places.
+                          Example:
+krogoth
+
+_____________________________________________________________________________
+ELTF_YOCTO_PROJ_DOWNLOAD_TXTURL  General parameters. These two are IDENTICAL
+ELTF_YOCTO_PROJ_DOWNLOAD_URL     strings with correct Yocto version string
+                                 at the end, typically without "dot".
+                          xi:include ULINK_YOCTO_PROJECT_DOWNLOAD/1
+                          This is an <ulink url="...">...</ulink>
+                          Example:
+http://www.yoctoproject.org/downloads/core/krogoth/21
+
+_____________________________________________________________________________
+ELTF_EL_DOWNLOAD_TXTURL   General parameters. These two are IDENTICAL strings
+ELTF_EL_DOWNLOAD_URL      and shall be the http:/..... address where
+                          Enea NFV Access can be downloaded
+                          Often containing same version as in ELTF_EL_REL_VER
+                          xi:include ULINK_ENEA_LINUX_URL/1
+                          This is an <ulink url="...">...</ulink>
+                          Example:
+http://linux.enea.com/6
+
+_____________________________________________________________________________
+ELTF_PL_CLONE_W_REPO      Multiline commands to run repo to clone everything.
+                          Use the variable $MACHINE/default.xml (the text in
+                          the book will list the avaiable values of MACHINE,
+                          taken from the manifest repository)
+                          xi:include eltf-repo-cloning-enea-linux/1
+                          This is a <programlisting>...</programlisting>
+                          Example:
+mkdir enea-linux
+cd enea-linux
+repo init -u git@git.enea.com:linux/manifests/el_manifests-virtualization.git \
+    -b refs/tags/EL6 -m $MACHINE/default.xml
+repo sync
+
+_____________________________________________________________________________
+ELTF_ECLIPSE_VERSION      Optional general parameter string.
+                          NOT YET READY DEFINED
+                          Just now a release manage must manually set
+                          condition="hidden" on the Eclipse section,
+                          if Eclipse is not included in the release.
+                          ELTF just replaces ELTF_ECLIPSE_VERSION with a full
+                          string with "X.Y (name)"
+                          It includes the ID and can only be ONCE in the book.
+                          xi:include eltf-eclipse-version-row
+                          Example.
+4.5 (Mars)
+
+
+_____________________________________________________________________________
+ELTF_T_*                  All these are in each target (MACHINE) and ELTF
+                          must separately replace them with strings for
+                          each target
+                          NOTE: All (except the MANIFEST_DIR) are in rows
+                                in a table and ELTF can select to append
+                                more parameters by adding more rows
+
+_____________________________________________________________________________
+ELTF_T_MANIFEST_DIR       This happens to be in two places. Must be exactly
+ELTF_T_MANIFEST_DIR       the directory name in the manifest, e.g. same
+                          as the MACHINE names in $MACHINE/default.xml.
+                          In book: a) Part of section ID
+                                   b) Part of section title
+                          Examples:
+p2041rgb
+  or
+ls1021aiot
+  or
+qemuarm
+
+_____________________________________________________________________________
+ELTF_T_NAME               Target specific: "Target Official Name"
+                          NOT same as the target directory name in most cases.
+                          In book: An <entry> element in a row
+                          Examples:
+P2041RGB
+  or
+LS1021a-IoT
+  or
+qemuarm
+
+_____________________________________________________________________________
+ELTF_T_ARC_DESC           Target specific: "Architecture and Description"
+                          It can be a short identification string or
+                          it can be a longer descriptive sentence.
+                          In book: An <entry> element in a row
+                          Examples:
+Power, e500mc
+  or
+ARM Cortex-A7
+
+_____________________________________________________________________________
+ELTF_T_DS_TXTURL          Target specific: "Link to target datasheet. These
+ELTF_T_DS_URL             two usually are IDENTICAL strings with correct
+                          hyperlink to the target's official datasheet.
+                          In book: an <ulink url="...">...</ulink>
+                          Only if the link is VERY LONG, the text part shall
+                          instead be a descriptive string (see 2:nd example).
+                          NOTE: Also here no spaces or line-feeds!
+                          Examples:
+url="http://wiki.qemu.org">http://wiki.qemu.org
+or
+url="http://www.nxp.com/products/microcontrollers-and-processors/arm-processors/qoriq-arm-processors/qoriq-ls1021a-iot-gateway-reference-design:LS1021A-IoT">link to NXP's datasheet
+
+_____________________________________________________________________________
+ELTF_T_POKY_VER           Target specific: "Poky version" created either
+                          from POKYVERSION in poky.ent
+                          or using a hashvalue with a leading string, in
+                          which case it may be different per target.
+                          In book: An <entry> in a row
+                          Examples:
+15.0.0
+or
+Git commit id: 75ca53211488a3e268037a44ee2a7ac5c7181bd2
+
+_____________________________________________________________________________
+ELTF_T_GCC_VER            Target specific: "GCC Version". Should be in poky
+                          but not easy to find among various parameters.
+                          ELTF would extract it from build logs building SDK
+                          and it is possibly different per target.
+                          In book: An <entry> in a row
+                          Example:
+5.3
+
+_____________________________________________________________________________
+ELTF_T_KERN_VER           Target specific: "Linux Kernel Version". Often
+                          different per target.
+                          In book: An <entry> in a row
+                          Example:
+3.12
+
+_____________________________________________________________________________
+ELTF_T_DRIVERS            Target specific: "Supported Drivers". This is a
+                          comma-separated list of driver names.
+                          ELTF should create the list in same order for each
+                          target, e.g. alphabetic migth be OK.
+                          In book: An <entry> in a row
+                          Example:
+Ethernet, I2C, SPI, PCI, USB, SD/SDHC/SDXC
+
+
+_____________________________________________________________________________
+ELTF_T_EL_RPM_TXTURL      Target specific: "Enea rpm folder for downloading
+ELTF_T_EL_RPM_URL         RPM packages for this target". These two are
+                          INDENTICAL strings with hyperlink to the web site
+                          at Enea where the customer can download RPMs
+                          Note: Often the ELFT_EL_REL_VER value and
+                                the ELTF_T_MANIFEST_DIR are used in the link.
+                          In book: an <ulink url="...">...</ulink>
+                          Example:
+url="https://linux.enea.com/6/ls1021aiot/rpm">https://linux.enea.com/6/ls1021aiot/rpm
+
+_____________________________________________________________________________