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

Change-Id: I47ebb99993f4603ef34f2366f679cc267bf0c995

7 files changed, 13 insertions, 13 deletions

diff --git a/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
index 993da22..f722aef 100644
--- a/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
+++ b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
@@ -692,7 +692,7 @@
       <orderedlist>
         <listitem>
           <para>Select the trgt uCPE device -&gt; VNF -&gt; Instances -&gt;
-          128T -&gt; Delete.</para>
+          <literal>128T_trgt_1</literal> -&gt; Delete.</para>
         </listitem>
 
         <listitem>
@@ -707,7 +707,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF -&gt; Descriptors, select all bundles -&gt;
+          <para>VNF -&gt; Descriptors, select <literal>128T</literal> -&gt;
           Offboard.</para>
         </listitem>
       </orderedlist>
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index f52e33d..f554b37 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -40,7 +40,7 @@
 |  |  |---centos_128t_internet_ci.iso  - 128T cloud init (day-0) iso image.
 |  |---fortigate
 |  |  |---fg_basic_fw.conf             - Fortigate day-0 configuration.
-|  |  |---fortigateInstance.json       - Fortigate instantiantion.
+|  |  |---fortigateInstance.json       - Fortigate instantiation.
 |  |  |---fortigate.json               - Fortigate onboarding.
 |  |  |---fortigateLicense.lic
             - Fortigate license - contact Fortinet to get a VNF image and license file.
@@ -77,7 +77,7 @@
   </itemizedlist>
 
   <note>
-    <para>Before starting the two usecases detailed in the following appendix,
+    <para>Before starting the two use-cases detailed in the following appendix,
     the uCPE Device needs to be added into the Enea Edge Management
     application.</para>
   </note>
@@ -93,7 +93,7 @@
   <para>To run a test:</para>
 
   <programlisting>&gt; cd automation_framework/unittestSuite/
-&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPEManager IP address&gt; -n \
+&gt; python unittestSuite.py -u admin -p admin -H &lt;EneaEdgeManagement IP address&gt; -n \
 &lt;uCPE Device name&gt; -s &lt;Test suite&gt; -d &lt;description&gt;</programlisting>
 
   <para>The <literal>Test suite</literal> must be one from any of the
diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
index abb4be8..ac09bda 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
@@ -3,7 +3,7 @@
   <title>Example Tests Results using the Automation Framework and Test
   Harness</title>
 
-  <para>In order to run the following example usecases, certain configuration
+  <para>In order to run the following example use-cases, certain configuration
   file entries need to be modified according to the network setup that it will
   be used, for more details see the previous appendix:</para>
 
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-example-usecases/doc/enea_test_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
index 0c3815e..846ec86 100644
--- a/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
@@ -272,7 +272,7 @@ tail -f /var/log/testpmd-out</programlisting>
       <orderedlist>
         <listitem>
           <para>Make sure that neither uCPE device 1 nor uCPE device 2 have
-          any configured host interfaces by selcting uCPE device :
+          any configured host interfaces by selecting uCPE device :
           <literal>Configuration</literal> -&gt;
           <literal>OpenVSwitch</literal> -&gt; <literal>Host
           Interfaces</literal>.</para>
diff --git a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
index 4529fbf..3208168 100644
--- a/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -10,7 +10,7 @@
     <title>Prerequisites</title>
 
     <para>The 128T router and the Fortinet firewall in a service chain require
-    the following prequisites for this example use case:</para>
+    the following prerequisites for this example use case:</para>
 
     <itemizedlist spacing="compact">
       <listitem>
@@ -1055,8 +1055,8 @@
         </listitem>
 
         <listitem>
-          <para>VNF -&gt; Descriptors. Select all bundles -&gt;
-          Offboard.</para>
+          <para>VNF -&gt; Select one by one, the Fortigate and 128T VNF
+          Descriptors -&gt; Offboard.</para>
         </listitem>
       </orderedlist>
     </section>
diff --git a/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
index affbf39..0df2605 100644
--- a/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
@@ -394,7 +394,7 @@ disable      type: physical   netflow-sampler: disable    sflow-sampler: disable
       <para>Since Fortigate VNF, which is acting as router and firewall, is
       configured to be the DHCP server for the LAN network, the device
       interface connected to the uCPE LAN port has to be configured to get
-      dinamically assigned IPs. These IPs are in the 172.0.0.0/24 network for
+      dynamically assigned IPs. These IPs are in the 172.0.0.0/24 network for
       Site1 and the 172.10.10.0/24 network for Site2. Therefore, site-to-site
       connectivity can be checked (from Site1) as such:</para>