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

Change-Id: I47ebb99993f4603ef34f2366f679cc267bf0c995

3 files changed, 5 insertions, 5 deletions

diff --git a/doc/book-enea-edge-telemetry-open-source/doc/README b/doc/book-enea-edge-telemetry-open-source/doc/README
index 1077acb..e5cb471 100644
--- a/doc/book-enea-edge-telemetry-open-source/doc/README
+++ b/doc/book-enea-edge-telemetry-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of Enea Edge Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
 lists of packages and licenses.
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" />