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

Change-Id: I47ebb99993f4603ef34f2366f679cc267bf0c995

2 files changed, 4 insertions, 4 deletions

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