Merge the code from develop to master for 2.5.0demo_CPDX-3644demo_CPDX-3634

Change-Id: I47ebb99993f4603ef34f2366f679cc267bf0c995

3 files changed, 7 insertions, 7 deletions

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>