Example_Usecases: Re-structure example usecases

- Remove some images related to VNF onboard and instantite
- Add Intro section to make more cleare what the purpose of this document is
- Replace target with uCPE device
- Make more cleare uCPE device setup, VNF onboard and instantite
  steps in Clavister and Enea usecases
- Rename vnf_fortigate.xml to forti_vnf_examples so all example files
  have same naming style

Change-Id: Ic414f83a60014dc4ac6964508017ddb81811ce4f
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

25 files changed, 717 insertions, 781 deletions

diff --git a/doc/book-enea-nfv-access-example-usecases/doc/book.xml b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
index 22740d2..0f69570 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/book.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
@@ -14,6 +14,9 @@
 
   <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+  <xi:include href="introduction.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
                           
   <xi:include href="clav_vnf_examples.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -21,7 +24,7 @@
   <xi:include href="enea_vnf_examples.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
                           
-  <xi:include href="vnf_fortigate.xml"
+  <xi:include href="forti_vnf_examples.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />
                           
   <xi:include href="inband_management.xml"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
index ac27ba8..a73c5e8 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
@@ -2,167 +2,179 @@
 <chapter id="clav_vnf_example">
   <title>Clavister VNF Example Use-cases</title>
 
-  <section id="clav_vnf">
-    <title>Clavister VNF</title>
-
-    <para>In this use case, <literal>target_1</literal> will run the Clavister
-    VNF and an Open vSwitch bridge, while <literal>target_2</literal> will run
-    two iPerf VNFs.</para>
-
-    <figure>
-      <title>Clavister VNF Example Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata align="center" fileref="images/clavister_vnf_diagram.png"
-                     scale="50" />
-        </imageobject>
-      </mediaobject>
-    </figure>
-
-    <para><emphasis role="bold">How to setup the target to run the Clavister
-    VNF and an Open vSwitch Bridge</emphasis></para>
-
-    <orderedlist>
-      <para><emphasis role="bold">Configure the Network on target_1 and
-    target_2:</emphasis></para>
-
-      <listitem>
-        <para>From the uCPE Manager select the target_1:
-        <literal>Configuration</literal> -&gt; <literal>OpenVSwitch</literal>
-        -&gt; H<literal>ost Interfaces</literal> -&gt;
-        <literal>Add</literal></para>
-      </listitem>
+  <section id="prere_clav_vnf">
+    <title>Prerequisites</title>
 
-      <listitem>
-        <para>Select the network interface that will be used to connect to the
-        second target, configure it for DPDK, and click
-        <literal>Create</literal> to send the configuration to the
-        target:</para>
-
-        <figure>
-          <title>Host Interface Creation</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/host_interface_creation.png" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Create an Open vSwitch bridge (<literal>ovsbr0</literal>) with
-        one DPDK interface by selecting the <literal>Add</literal> button from
-        the <literal>Bridges</literal> tab.</para>
-      </listitem>
-
-      <listitem>
-        <para>Once the bridge creation popup appears, fill the fields and add
-        the physical interface:</para>
-
-        <figure>
-          <title>OVS bridge</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/ovs_bridge_zero.png"
-                         scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Repeat the steps above on the target_2, by also using one DPDK
-        interface and creating an OVS bridge.</para>
-      </listitem>
-    </orderedlist>
-
-    <orderedlist>
-      <para><emphasis role="bold">Instantiate the VNFs:</emphasis></para>
-
-      <para>Once the network configuration has been completed on both targets
-      instantiate the VNFs:</para>
-
-      <para><emphasis role="bold">A) Instantiate Clavister VNF on
-      target_1:</emphasis></para>
+    <para>The following files are needed for this example use case:</para>
 
+    <itemizedlist>
       <listitem>
-        <para>Select the target_1, then the VNF option from the top toolbar:
-        <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
-        <literal>Add</literal>.</para>
+        <para><literal>enea-nfv-access-vnf-qemux86-64.qcow2</literal>. This
+        image is provided with your release.</para>
       </listitem>
 
       <listitem>
-        <para>Fill in the required information about the
-        <literal>Clavister</literal> VNF, (the default network configuration
-        can be used):</para>
-
-        <figure>
-          <title>VNF Instance</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/vnf_instance.png"
-                         scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-    </orderedlist>
-
-    <orderedlist>
-      <para><emphasis role="bold">B) Instantiate two iPerf VNFs (one as client
-      and one as server) on target_2: </emphasis></para>
-
-      <listitem>
-        <para>Instantiate two <literal>iPerf</literal> VNFs on target_2. One
-        will act as the server and the second as the client.</para>
+        <para><literal>clavister-cos-stream-&lt;version&gt;-virtual-x64-generic.qcow2</literal>.
+        This image is provided with your release.</para>
       </listitem>
 
       <listitem>
-        <para>Select target_2, then the VNF option from the top toolbar:
-        <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
-        <literal>Add</literal>.</para>
+        <para>License for the Clavister VNF (needed as Cloud-Init content in the Cloud-Init tab). 
+          This file is available through the VNF provider.</para>
       </listitem>
+    </itemizedlist>
+  </section>
 
-      <listitem>
-        <para>In the <literal>VNF Instance</literal> window, select the first
-        <literal>iPerf</literal> VNF from the dropdown menu, configure it to
-        act as a server by unchecking the <literal>Client mode IPerf</literal>
-        box, and click the <literal>Create</literal> button.</para>
-      </listitem>
+  <section id="clav_vnf">
+    <title>Clavister VNF using Open vSwitch Bridge</title>
 
-      <listitem>
-        <para>Select <literal>Add</literal>, enable the <literal>Client mode
-        IPerf</literal> checkbox and then click <literal>Create</literal> to
-        instantiate the second <literal>iPerf VNF</literal> as a client, and
-        to run it in client mode.</para>
-      </listitem>
+    <para>In this use-case, uCPE device 1 will run the Clavister VNF and an
+    Open vSwitch bridge, while uCPE device 2 will run two iPerf VNFs.</para>
 
-      <listitem>
-        <para>In order to check that traffic is forwarded between the VNFs,
-        connect to the iPerf VNF client console:</para>
+    <figure>
+      <title>Clavister VNF Example Overview</title>
 
-        <para>Connect to the target_2 by using: <literal>SSH</literal> -&gt;
-        <literal>user</literal> (root) -&gt;<literal>Connect</literal> and run
-        the following:</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata align="center" fileref="images/clavister_vnf_diagram.png"
+                     scale="50" />
+        </imageobject>
+      </mediaobject>
+    </figure>
 
-        <programlisting>virsh list
-virsh console 
-root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
-      </listitem>
-    </orderedlist>
+    <section id="clav_vnf_setup_1">
+      <title>uCPE device Setup</title>
+
+      <para><emphasis role="bold">Configure Network interfaces on the uCPE devices:</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>From the uCPE Manager select uCPE device 1, then access <literal>Configuration</literal> 
+            -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces</literal> -&gt; 
+            <literal>Add.</literal></para>
+        </listitem>
+
+        <listitem>
+          <para>Select the network interface that will be used to connect to uCPE device 2. 
+            Configure it for DPDK, and click <literal>Create</literal> to send the configuration 
+            to that uCPE device.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create an Open vSwitch bridge (<literal>ovsbr0</literal>) with
+          one DPDK interface, by selecting the <literal>Add</literal> button
+          from the <literal>Bridges</literal> tab.</para>
+        </listitem>
+
+        <listitem>
+          <para>Once the bridge creation popup appears, fill-in the required fields and add the 
+            physical interface.</para>
+        </listitem>
+
+        <listitem>
+          <para>Repeat the steps above on uCPE device 2, using one DPDK interface and creating 
+            another OVS bridge.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="onboard_vnf_clav">
+      <title>Onboard the VNFs</title>
+
+      <orderedlist>
+        <listitem>
+          <para>Select <literal>VNF</literal> -&gt; <literal>Descriptor</literal> -&gt; 
+            <literal>On-board</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the <literal>VM Image</literal> radio button.</para>
+        </listitem>
+
+        <listitem>
+          <para>Provide the path to the qcow image by selecting <literal>Browse</literal>
+          from <literal>VM image file</literal> option.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fill the required fields below and press <literal>Onboard</literal>:</para>
+
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para><emphasis role="bold">Memory in MB</emphasis>: 1024</para>
+            </listitem>
+
+            <listitem>
+              <para><emphasis role="bold">Nr. of CPUs</emphasis>: 1</para>
+            </listitem>
+
+            <listitem>
+              <para><emphasis role="bold">Storage in GB</emphasis>: 10</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section id="instance_vnfs_clav">
+      <title>Instantiate the VNFs</title>
+
+      <para><emphasis role="bold">A) Instantiate the Clavister VNF on uCPE device 1:</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select uCPE device 1, then from the top toolbar: <literal>VNF</literal> -&gt; 
+            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fill in the required information about the Clavister VNF, (the default network 
+            configuration can be used) and select <literal>Create</literal>.</para>
+        </listitem>
+      </orderedlist>
+      
+      <para><emphasis role="bold">B) Instantiate two Enea VNFs (one as the client and one as the 
+        server) on uCPE device 2:</emphasis></para>
+      
+      <orderedlist>
+        <listitem>
+          <para>Select uCPE device 2, then from the top toolbar: <literal>VNF</literal> -&gt; 
+            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>In the new <literal>VNF Instance</literal> window, select the Enea VNF from the 
+            dropdown menu, configure it to act as a server by unchecking the <literal>Client mode 
+            IPerf</literal> box, and then click <literal>Create</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select <literal>Add</literal> once more, enable the <literal>Client mode 
+            IPerf</literal> checkbox this time, and click <literal>Create</literal> to instantiate 
+            the second <literal>iPerf VNF</literal> as a client, and to run it in client mode.</para>
+        </listitem>
+
+        <listitem>
+          <para>In order to check that traffic is forwarded between the two VNFs, connect to the 
+            iPerf VNF client console: <literal>SSH</literal> -&gt; <literal>user</literal> (root) 
+            -&gt; <literal>Connect</literal> and run the following:</para>
+
+          <programlisting>
+            virsh list
+            virsh console
+            root@qemux86-64:~# iperf3 -c 192.168.10.10
+          </programlisting>
+        </listitem>
+      </orderedlist>
+    </section>
   </section>
-
+  
   <section id="clav_example_sriov">
     <title>Clavister VNF using SR-IOV</title>
 
-    <para>In this use case, target 1 will run the iPerf server and iPerf
-    client VNFs using SR-IOV and target 2 will run the Clavister VNF using
-    SR-IOV with two virtual functions (vf1 and vf2):</para>
+    <para>In this use-case, uCPE device 1 will run the iPerf server and iPerf
+    client VNFs using SR-IOV, while uCPE device 2 will run the Clavister VNF
+    using SR-IOV with two virtual functions (vf1 and vf2):</para>
 
     <figure>
       <title>Example Overview</title>
@@ -175,93 +187,80 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
       </mediaobject>
     </figure>
 
-    <orderedlist>
-      <listitem>
-        <para>On target 2, create an SR-IOV configuration with 2 virtual
-        functions: <literal>Configuration</literal> -&gt;
-        <literal>OpenVSwitch</literal> -&gt; <literal>Host
-        Interfaces</literal> -&gt; <literal>Add</literal>:</para>
-
-        <figure>
-          <title>SR-IOV configuration with 2 virtual functions</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/sriov_configuration.png" scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Instantiate the Clavister VNF on target 2, by clicking
-        <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
-        <literal>Add</literal>.</para>
-
-        <para>Select <literal>SrIovAdapterPool</literal> as an Interface type
-        for both Interface1 type and 2 type, before clicking
-        <literal>Create</literal>:</para>
-
-        <figure>
-          <title>Instantiating the Clavister VNF on target 2</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/srlov_adap_pool.png"
-                         scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>On target 1, create an SR-IOV interface as done in step
-        1.</para>
-      </listitem>
-
-      <listitem>
-        <para>Create the iPerf server on target 1. Select
-        <literal>SrIovAdapterPool</literal> as an Interface type:</para>
-
-        <figure>
-          <title>IPerf Server Interface Type</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/iperf_server_inttype.png" scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Create the iPerf client on target 1. Select
-        <literal>SrIovAdapterPool</literal> as an Interface type and tick the
-        <literal>Client mode IPer</literal> checkbox:</para>
-
-        <figure>
-          <title>IPerf Client Interface Type</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/iperf_client_inttype.png" scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>In order to check that traffic is forwarded between the VNFs,
-        connect to the iPerf VNF client console by using:
-        <literal>SSH</literal> -&gt; <literal>user</literal> (root)
-        -&gt;<literal>Connect</literal> and run the following
-        commands:<programlisting>virsh list
-virsh console 
-root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting></para>
-      </listitem>
-    </orderedlist>
+    <section id="clav_vnf_setup_2">
+      <title>Example Setup</title>
+
+      <orderedlist>
+        <listitem>
+          <para>On uCPE device 2, create an SR-IOV configuration with 2
+          virtual functions by selecting <literal>Configuration</literal>
+          -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Host
+          Interfaces</literal> -&gt; <literal>Add</literal>:</para>
+
+          <figure>
+            <title>SR-IOV configuration with 2 virtual functions</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center"
+                           fileref="images/sriov_configuration.png" scale="80" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+
+        <listitem>
+          <para>Instantiate the Clavister VNF on uCPE device 2: <literal>VNF</literal> 
+            -&gt; <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select <literal>SrIovAdapterPool</literal> as an Interface
+          type for both Interface 1 type and 2 type, before clicking
+          <literal>Create</literal>.</para>
+
+          <figure>
+            <title>Instantiating the Clavister VNF on uCPE device 2</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/srlov_adap_pool.png"
+                           scale="70" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+
+        <listitem>
+          <para>On uCPE device 1, create an SR-IOV interface as done in step
+          1.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create the iPerf server on uCPE device 1 and select
+          <literal>SrIovAdapterPool</literal> as an Interface type.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create the iPerf client on uCPE device 1. Select
+          <literal>SrIovAdapterPool</literal> as an Interface type and tick
+          the <literal>Client mode IPerf</literal> checkbox.</para>
+        </listitem>
+
+        <listitem>
+          <para>In order to check that traffic is forwarded between the VNFs,
+          connect to the iPerf VNF client console by using:
+          <literal>SSH</literal> -&gt; <literal>user</literal> (root)
+          -&gt;<literal>Connect</literal> and run the following
+          commands:
+            <programlisting>
+              virsh list
+              virsh console 
+              root@qemux86-64:~# iperf3 -c 192.168.10.10
+            </programlisting>
+          </para>
+        </listitem>
+      </orderedlist>
+    </section>
   </section>
 </chapter>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml b/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
index cfb9b72..f2d7910 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/enea_vnf_examples.xml
@@ -1,13 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="enea_vnf_examples">
   <title>Enea VNF Example Use-cases</title>
 
+  <section id="prere_enea_vnf">
+    <title>Prerequisites</title>
+
+   <para>The following file(s) are needed for this example use-case: 
+     <literal>enea-nfv-access-vnf-qemux86-64.qcow2</literal>. This image is 
+     provided with your release.</para>
+  </section>
+
   <section id="enea_vnf">
     <title>TestPMD VNF</title>
 
-    <para>Use case description: pktgen[DPDK] - PHY1 - PHY2 - [DPDK]OVS -
-    VM[DPDK]testpmd(forwarding) - OVS[DPDK] - VM[DPDK]
-    testpmd(termination).</para>
+    <para>In this use-case, <literal>uCPE device 1</literal> will run pktgen 
+      (the DPDK application) and <literal>uCPE device 2</literal> will onboard 
+      and instantiate two VNFs. One VNF will run <literal>testpmd_fwd</literal>, 
+      forwarding traffic, and the other will run <literal>testpmd_term</literal> 
+      which will terminate traffic.</para>
 
     <figure>
       <title>Enea VNF Example Overview</title>
@@ -20,285 +30,254 @@
       </mediaobject>
     </figure>
 
-    <para><emphasis role="bold">How to setup the Enea VNF
-    Example</emphasis></para>
-
-    <para><emphasis role="bold">Configure the Network on target_1 and
-    target_2:</emphasis></para>
-
-    <orderedlist>
-      <listitem>
-        <para>Bind the host interfaces to the DPDK by selecting the target
-        first, then accessing <literal>Configuration</literal> -&gt;
-        <literal>OpenVSwitch</literal> -&gt; <literal>Host
-        Interfaces</literal> -&gt; <literal>Add</literal>:</para>
-
-        <figure>
-          <title>Adding OVS Host Interfaces</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/ovs_host_interface.png" scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Select the network interface that will be used to connect to the
-        second target and configure it for the DPDK:</para>
-
-        <figure>
-          <title>Configuring the host interface</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/secondtar_hostinterface.png"
-                         scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Select the <literal>Create</literal> button to send the
-        configuration to the target.</para>
-      </listitem>
-
-      <listitem>
-        <para>Repeat the same steps on the target_2.</para>
-      </listitem>
-    </orderedlist>
-
-    <para><emphasis role="bold">Create an OpenVSwitch bridge on
-    target_1:</emphasis></para>
-
-    <orderedlist>
-      <listitem>
-        <para>Create an OpenVSwitch bridge (<literal>ovsbr0</literal>) on
-        target_1 that uses one DPDK interface, by selecting the
-        <literal>Add</literal> button from the Bridges tab and then selecting
-        the target first, then accessing <literal>Configuration</literal>
-        -&gt; <literal>OpenVSwitch</literal>-&gt;
-        <literal>Bridges</literal>:</para>
-
-        <figure>
-          <title>OVS Bridge Table</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/ovs_bridge_tab.png"
-                         scale="75" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <figure>
-          <title>Adding the interface to the OVS Bridge</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/ovs_bridge_two.png"
-                         scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-    </orderedlist>
-
-    <para><emphasis role="bold">Onboard the TestPMD VNF on
-    target_2:</emphasis></para>
-
-    <para>Onboard the TestPMD VNF on target_2 by selecting the target, then accessing
-    <literal>VNF</literal> -&gt; <literal>Descriptor</literal> -&gt; <literal>Add</literal>.</para>
-
-    <para><emphasis role="bold">Instantiate the TestPMD VNF on
-    target_2:</emphasis></para>
-
-    <orderedlist>
-      <listitem>
-        <para>Instantiate TestPMD VNF (testpmd_fwd) on target_2 by selecting
-        the target first, then accessing <literal>VNF</literal> -&gt;
-        <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Instantiate TestPMD VNF (testpmd_term) on target_2 by selecting
-        the target first, then accessing <literal>VNF</literal> -&gt;
-        <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
-      </listitem>
-
-      <listitem>
-        <para>Configure the VNF (testpmd_fwd) to forward trafic:</para>
-
-        <figure>
-          <title>Configuring the VNF (testpmd_fwd)</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/traffic_forward.png"
-                         scale="85" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Configure the VNF (testpmd_term) to terminate traffic:</para>
-
-        <figure>
-          <title>Configuring the termVNF</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/traffic_terminate.png"
-                         scale="85" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Add OpenVSwitch flows to control this traffic:</para>
-
-        <figure>
-          <title>Configuring the FWD flow</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/flow_fwd.png"
-                         scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-
-        <figure>
-          <title>Configuring the TERM flow</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/flow_term.png"
-                         scale="90" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>Start pktgen on target_1. Connect to the target by selecting the
-        target first, then accessing <literal>SSH</literal> -&gt;
-        <literal>user</literal> (root) and perform the following:</para>
-
-        <programlisting>cd /usr/share/apps/pktgen/
-./pktgen -c 0x7 -n 4 --proc-type auto --socket-mem 256 -w 0000:05:00.3 -- \
-   -P -m "[1:2].0"
-Pktgen:/&gt; start 0</programlisting>
-
-        <note>
-          <para>The PCI address &lt;0000:05:00.3&gt; used in this example
-          varies depending on the target. To determine the exact PCI address
-          used, look in the target specific Network configuration.</para>
-        </note>
-      </listitem>
-
-      <listitem>
-        <para>Connect to the forwarder VNF in order to check the traffic
-        statistics by selecting the target first, then accessing
-        <literal>SSH</literal> -&gt; <literal>user</literal> (root):</para>
-
-        <programlisting>Virsh list
-Virsh console 1
-# Qemux86-64 login: root
-tail -f /var/log/testpmd-out</programlisting>
-
-        <figure>
-          <title>Traffic Statistics</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/connection_information.png"
-                         scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-    </orderedlist>
-  </section>
-
-  <section condition="hidden" id="vnf_pci">
-    <title>TestPMD VNF using PCI passthrough</title>
-
-    <para>In this use case, target 1 will run the Pktgen and target 2 will run
-    the TestPMD VNF. Both will be using PCI passthrough:</para>
-
-    <figure>
-      <title>TestPMD VNF using PCI passthrough Overview</title>
-
-      <mediaobject>
-        <imageobject>
-          <imagedata align="center" fileref="images/testPMD_VNF_PCI.png"
-                     scale="65" />
-        </imageobject>
-      </mediaobject>
-    </figure>
-
-    <orderedlist>
-      <listitem>
-        <para>Make sure that neither target 1 nor target 2 have any configured
-        host interfaces by selcting target: <literal>Configuration</literal>
-        -&gt; <literal>OpenVSwitch</literal> -&gt; <literal>Host
-        Interfaces</literal>.</para>
-      </listitem>
-
-      <listitem>
-        <para>On target 1 start the Pktgen VNF. Select
-        <literal>PciPassthrough</literal> as the Interface type.</para>
-
-        <para>From the drop-down list, select the PCI interface corresponding
-        to the NIC which is connected to target 2:</para>
-
-        <figure>
-          <title>Selecting the Pktgen VNF Interface</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/pciPass_interface.png"
-                         scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>On target 2, start the TestPmdForwarder VNF. Select
-        "PciPassthrough" as the Interface type. From the drop-down list,
-        select the PCI interface corresponding to the NIC which is connected
-        to target 1:</para>
-
-        <figure>
-          <title>Selecting the TestPmdForwarder VNF Interface</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/testpmd_fwdvnf_int.png" scale="70" />
-            </imageobject>
-          </mediaobject>
-        </figure>
-      </listitem>
-
-      <listitem>
-        <para>To check that traffic is being forwarded from target 2, SSH to
-        the target and connect to the VNFs console:</para>
-
-        <programlisting>Right click on target 2 and select SSH.
+    <section id="enea_vnf_setup">
+      <title>Example Setup</title>
+
+      <para><emphasis role="bold">Configure the Network interface on uCPE 
+        devices 1 and 2:</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>Bind the host interfaces to the DPDK by selecting uCPE device 1 
+            first, then accessing <literal>Configuration</literal> -&gt;
+          <literal>OpenVSwitch</literal> -&gt; <literal>Host
+          Interfaces</literal> -&gt; <literal>Add</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the network interface that will be used to connect to
+          the second uCPE device and configure it for the DPDK.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the <literal>Create</literal> button to send the
+          configuration to uCPE device 1.</para>
+        </listitem>
+
+        <listitem>
+          <para>Repeat these same steps on uCPE device 2.</para>
+        </listitem>
+      </orderedlist>
+
+      <para><emphasis role="bold">Create an Open vSwitch bridge on uCPE device
+      1:</emphasis></para>
+
+      <para>Create an Open vSwitch bridge (<literal>ovsbr0</literal>) on uCPE 
+        device 1, that uses one DPDK interface:</para>
+        
+        <orderedlist>
+          <listitem><para>Click the <literal>Add</literal> button from the 
+            Bridges tab.</para>
+          </listitem>
+          
+          <listitem><para>Select uCPE device 1, then access 
+            <literal>Configuration</literal> -&gt;<literal>OpenVSwitch</literal> 
+            -&gt;<literal>Bridges</literal>.</para>
+          </listitem>
+        </orderedlist>
+
+      <para><emphasis role="bold">Onboard the Enea VNF:</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select <literal>VNF</literal> -&gt;<literal>Descriptor</literal> 
+            -&gt; <literal>On-board</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Select the <literal>VM Image</literal> radio button.</para>
+        </listitem>
+
+        <listitem>
+          <para>Provide the path to the qcow image by selecting <literal>Browse
+          </literal> from the <literal>VM image file</literal> option.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fill the required fields below and press <literal>Onboard</literal>:
+          </para>
+
+          <itemizedlist spacing="compact">
+            <listitem>
+              <para><emphasis role="bold">Memory in MB</emphasis>: 1024</para>
+            </listitem>
+
+            <listitem>
+              <para><emphasis role="bold">Nr. of CPUs</emphasis>: 1</para>
+            </listitem>
+
+            <listitem>
+              <para><emphasis role="bold">Storage in GB</emphasis>: 10</para>
+            </listitem>
+          </itemizedlist>
+        </listitem>
+      </orderedlist>
+
+      <para><emphasis role="bold">Instantiate two VNFs on uCPE device 2:</emphasis></para>
+
+      <orderedlist>
+        <listitem>
+          <para>Select uCPE device 2, then access <literal>VNF</literal> -&gt; 
+            <literal>Instances</literal> -&gt; <literal>Add</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Fill-in the required fields and click <literal>Create</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Configure VNF 1 to forward traffic.</para>
+        </listitem>
+
+        <listitem>
+          <para>Configure VNF 2 to terminate traffic.</para>
+        </listitem>
+
+        <listitem>
+          <para>Add Open vSwitch flows to control this traffic:</para>
+
+          <figure>
+            <title>Configuring the FWD flow</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/flow_fwd.png"
+                           scale="90" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+
+          <figure>
+            <title>Configuring the TERM flow</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center" fileref="images/flow_term.png"
+                           scale="90" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+
+        <listitem>
+          <para>Start pktgen on uCPE device 1. Connect to the device by selecting
+            it first, then access <literal>SSH</literal> -&gt; <literal>user</literal> 
+            (root) and perform the following:</para>
+
+          <programlisting>
+            cd /usr/share/apps/pktgen/
+            ./pktgen -c 0x7 -n 4 --proc-type auto --socket-mem 256 -w 0000:05:00.3 -- \
+            -P -m "[1:2].0"
+            Pktgen:/&gt; start 0</programlisting>
+
+          <note>
+            <para>The PCI address &lt;0000:05:00.3&gt; used in this example
+            varies depending on the uCPE device. To determine the exact PCI
+            address used, look in the uCPE device specific Network
+            configuration.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Connect to the forwarder VNF in order to check the traffic
+          statistics, by selecting the uCPE device first, then accessing
+          <literal>SSH</literal> -&gt; <literal>user</literal> (root):</para>
+
+          <programlisting>
+            Virsh list
+            Virsh console 1
+            # Qemux86-64 login: root
+            tail -f /var/log/testpmd-out</programlisting>
+
+          <figure>
+            <title>Traffic Statistics</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center"
+                           fileref="images/connection_information.png"
+                           scale="70" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+      </orderedlist>
+    </section>
+
+    <section condition="hidden" id="vnf_pci">
+      <title>TestPMD VNF using PCI passthrough</title>
+
+      <para>In this use case, uCPE device 1 will run the Pktgen and uCPE
+      device 2 will run the TestPMD VNF. Both will be using PCI
+      passthrough:</para>
+
+      <figure>
+        <title>TestPMD VNF using PCI passthrough Overview</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" fileref="images/testPMD_VNF_PCI.png"
+                       scale="65" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+
+      <orderedlist>
+        <listitem>
+          <para>Make sure that neither uCPE device 1 nor uCPE device 2 have
+          any configured host interfaces by selcting uCPE device :
+          <literal>Configuration</literal> -&gt;
+          <literal>OpenVSwitch</literal> -&gt; <literal>Host
+          Interfaces</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>On uCPE device 1 start the Pktgen VNF. Select
+          <literal>PciPassthrough</literal> as the Interface type.</para>
+
+          <para>From the drop-down list, select the PCI interface
+          corresponding to the NIC which is connected to uCPE device 2:</para>
+
+          <figure>
+            <title>Selecting the Pktgen VNF Interface</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center"
+                           fileref="images/pciPass_interface.png" scale="70" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+
+        <listitem>
+          <para>On uCPE device 2, start the TestPmdForwarder VNF. Select
+          "PciPassthrough" as the Interface type. From the drop-down list,
+          select the PCI interface corresponding to the NIC which is connected
+          to uCPE device 1:</para>
+
+          <figure>
+            <title>Selecting the TestPmdForwarder VNF Interface</title>
+
+            <mediaobject>
+              <imageobject>
+                <imagedata align="center"
+                           fileref="images/testpmd_fwdvnf_int.png" scale="70" />
+              </imageobject>
+            </mediaobject>
+          </figure>
+        </listitem>
+
+        <listitem>
+          <para>To check that traffic is being forwarded from uCPE device 2,
+          SSH to the uCPE device and connect to the VNFs console:</para>
+
+          <programlisting>Right click on uCPE device  2 and select SSH.
 Run: virsh list
 Run: virsh console [VM NAME]
 Run: tail -f /opt/testpmd-out</programlisting>
-      </listitem>
-    </orderedlist>
+        </listitem>
+      </orderedlist>
+    </section>
   </section>
 </chapter>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_fortigate.xml b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
index 2bd0dc3..cc158fe 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_fortigate.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
@@ -32,11 +32,11 @@
   Descriptor configurations may be needed to support other configurations
   required by the customer.</para>
 
-  <para>Enea can provide assistance to provide alternative VNF Descriptor
+  <para>Enea can offer assistance and provide alternative VNF Descriptor
   configurations.</para>
 
   <note>
-    <para>While the prepared FortiGate bundle is provided from Enea Portal,
+    <para>While the prepared FortiGate bundle is available through the Enea Portal,
     additional content needs to be received from Fortinet directly. The
     FortiGate VNF license as well as any FortiGate specific documentation
     shall be requested from the local Fortinet sales representatives in your
@@ -72,30 +72,30 @@
 
         <tbody>
           <row>
-            <entry>Firewall</entry>
+            <entry align="left">Firewall</entry>
 
-            <entry>"All pass" mode</entry>
+            <entry align="left">"All pass" mode</entry>
           </row>
 
           <row>
-            <entry>WAN (Virtual Port1)</entry>
+            <entry align="left">WAN (Virtual Port1)</entry>
 
-            <entry><para>DHCP Client, dynamically assigned IP
-            address.</para>FortiGate In-Band
-            Management<superscript>1</superscript></entry>
+            <entry align="left"><para>DHCP Client, dynamically assigned IP
+            address.</para><para>FortiGate In-Band
+              Management<superscript>1</superscript>.</para></entry>
           </row>
 
           <row>
-            <entry>WAN (Virtual Port2)</entry>
+            <entry align="left">WAN (Virtual Port2)</entry>
 
-            <entry><para>IP address: 172.168.16.1</para>DHCP server (IP range
-            172.168.16.1 - 172.168.16.255).</entry>
+            <entry align="left"><para>IP address: 172.168.16.1</para><para>DHCP server (IP range
+            172.168.16.1 - 172.168.16.255).</para></entry>
           </row>
 
           <row>
-            <entry>WAN (Virtual Port3)</entry>
+            <entry align="left">WAN (Virtual Port3)</entry>
 
-            <entry>Ignored</entry>
+            <entry align="left">Ignored</entry>
           </row>
         </tbody>
       </tgroup>
@@ -104,8 +104,8 @@
     <para><superscript>1</superscript>FortiGate In-Band Management is a
     feature for running FortiGate Management traffic over WAN.</para>
 
-    <para>Instructions on how to alter the default configuration is provided
-    in the Fortigate VNF management chapter.</para>
+    <para>Instructions on how to alter the default configuration are provided
+      in the Fortigate VNF management chapter.<remark>where is this chapter located?</remark></para>
 
     <para><emphasis role="bold">Lab Setup</emphasis></para>
 
@@ -129,7 +129,7 @@
 
         <tbody>
           <row>
-            <entry>Lab Network</entry>
+            <entry align="left">Lab Network</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -145,7 +145,7 @@
           </row>
 
           <row>
-            <entry>Setup of an Intel Whitebox target device</entry>
+            <entry align="left">Setup of an Intel Whitebox uCPE device</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -174,7 +174,7 @@
                 </row>
 
                 <row>
-                  <entry>ETH0 connected to Lab Network (for Enea uCPE Manager
+                  <entry>ETH0 connected to the Lab Network (for Enea uCPE Manager
                   communications)</entry>
                 </row>
               </tbody>
@@ -182,7 +182,7 @@
           </row>
 
           <row>
-            <entry>Setup of a Lab Machine</entry>
+            <entry align="left">Setup of a Lab Machine</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -202,7 +202,7 @@
           </row>
 
           <row>
-            <entry>Setup of a Test Machine</entry>
+            <entry align="left">Setup of a Test Machine</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -222,31 +222,31 @@
           </row>
 
           <row>
-            <entry>FortiGate VNF</entry>
+            <entry align="left">FortiGate VNF</entry>
 
             <entrytbl cols="1">
               <tbody>
                 <row>
-                  <entry>Downloaded the FortiGate VNF Bundle from Enea Portal
+                  <entry>Download the FortiGate VNF Bundle from the Enea Portal
                   to the Lab Machine file system. Please see the Download
                   Chapter for more details.</entry>
                 </row>
 
                 <row>
-                  <entry>Downloaded FortiGate configuration examples from the
+                  <entry>Download FortiGate configuration examples from the
                   Enea Portal to the Lab Machine file system. Please check the
                   Download Chapter for more details. Unpack the configuration
                   examples on the Lab Machine.</entry>
                 </row>
 
                 <row>
-                  <entry>Retrieve FortiGate VNF license from Fortinet and
+                  <entry>Retrieve the FortiGate VNF license file from Fortinet and
                   store it on the Lab Machine file system. See FortiGate VNF
                   for details.</entry>
                 </row>
 
                 <row>
-                  <entry>Optionally retrieve FortiGate VNF documentation from
+                  <entry>Optionally, retrieve FortiGate VNF documentation from
                   Fortinet. See FortiGate VNF for details.</entry>
                 </row>
               </tbody>
@@ -262,17 +262,21 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/intel_whitebox.png"
-                     scale="35" />
+                     scale="45" />
         </imageobject>
       </mediaobject>
     </figure>
+  </section>
+
+  <section id="exam_setup_forti">
+    <title>Example Setup</title>
 
     <para><emphasis role="bold">uCPE Networking Setup</emphasis></para>
 
     <para>Before deploying the FortiGate Firewall, the Enea NFV Access
     platform has to be configured to the specific networking setup.</para>
 
-    <para>Since the firewall is using three External Network Interfaces, three
+    <para>Since the firewall uses three External Network Interfaces, three
     bridges need to be configured. Each bridge provides the ability to connect
     a physical network interface to the virtual machines' virtual network
     interface. Each physical to virtual network interface connection is setup
@@ -292,19 +296,19 @@
     <note>
       <para>For more details about interface configuration, please see the
       Network Configuration section in the chapter on Configuration
-      Options.</para>
+        Options.<remark>where is this chapter and its section located exactly?</remark></para>
     </note>
 
     <orderedlist>
       <listitem>
         <para>Start the setup by preparing each interface for attachment to a
         bridge. Bind the physical network interfaces to the DPDK by selecting
-        the target: <literal>Configuration</literal> -&gt;
+        the uCPE device, then accessing: <literal>Configuration</literal> -&gt;
         <literal>OpenVSwitch</literal> -&gt; <literal>Host Interfaces
         </literal>-&gt; <literal>Add</literal>:</para>
 
         <figure>
-          <title>Binding the physical network interface</title>
+          <title>Binding a physical network interface</title>
 
           <mediaobject>
             <imageobject>
@@ -330,15 +334,14 @@
       </listitem>
 
       <listitem>
-        <para>Create one OpenVSwitch bridge for each firewall network
-        connection (WAN, LAN1 and LAN2), by selecting the
-        <literal>Add</literal> button from Bridges tab:
+        <para>Create one Open vSwitch bridge for each firewall network
+        connection (WAN, LAN1 and LAN2), by selecting:
         <literal>Configuration</literal> -&gt;
-        <literal>OpenvSwitch</literal>-&gt; <literal>Bridges</literal>. A
-        popup like the following should appear:</para>
+        <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal> -&gt; <literal>Add</literal>. 
+          A popup like the following should appear:</para>
 
         <figure>
-          <title>Creating a bridge each Firewall Net. Connection</title>
+          <title>Creating a bridge for a Firewall Net. Connection</title>
 
           <mediaobject>
             <imageobject>
@@ -359,77 +362,45 @@
           <mediaobject>
             <imageobject>
               <imagedata align="center"
-                         fileref="images/configured_bridges.png" scale="65" />
+                         fileref="images/configured_bridges.png" scale="68" />
             </imageobject>
           </mediaobject>
         </figure>
       </listitem>
     </orderedlist>
+  </section>
 
-    <para><emphasis role="bold">Onboarding the FortiGate VNF</emphasis></para>
+  <section id="onboarding_fortigate">
+    <title>Onboarding the FortiGate VNF</title>
 
     <orderedlist>
       <listitem>
-        <para>To on-board the Fortigate VNF click the <literal>VNF</literal>
-        tab in the top toolbar: <literal>VNF</literal> -&gt;
-        <literal>Descriptors</literal> -&gt; <literal>On-board </literal>-&gt;
-        <literal>Browse</literal> options, and select the
-        <literal>Fortigate.zip</literal> file, before clicking
-        <literal>Send</literal>:</para>
-
-        <figure>
-          <title>Selecting Descriptors</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/descriptor_button.png"
-                         scale="45" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+        <para>To onboard the Fortigate VNF select from the top toolbar
+        <literal>VNF</literal> -&gt; <literal>Descriptors</literal> -&gt;
+        <literal>On-board.</literal></para>
       </listitem>
 
       <listitem>
-        <para>Wait for the <literal>Onboarding Status</literal> popup to
-        display the confirmation message (listed in green) and select
-        <literal>OK</literal>:</para>
-
-        <figure>
-          <title>Onboarding the new VNF</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/onboarding_status.png"
-                         scale="80" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+        <para>Click <literal>Browse</literal> to view selections, and choose the 
+          <literal>Fortigate.zip</literal> file, before clicking <literal>Send</literal>.</para>
       </listitem>
     </orderedlist>
+  </section>
 
-    <para><emphasis role="bold">Instantiate the FortiGate
-    VNF</emphasis></para>
+  <section id="instance_fortigate">
+    <title>Instantiating and Testing the FortiGate VNF</title>
+
+    <para><emphasis role="bold">Instantiate the FortiGate VNF</emphasis></para>
 
     <orderedlist>
       <listitem>
-        <para>Select the target, then from the top toolbar the select:
+        <para>Select the uCPE device, then from the top toolbar select
         <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt;
-        <literal>Add</literal>:</para>
-
-        <figure>
-          <title>Adding Instances to Target</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center" fileref="images/vnf_instances.png"
-                         scale="50" />
-            </imageobject>
-          </mediaobject>
-        </figure>
+        <literal>Add</literal>.</para>
 
         <para>Make sure you have downloaded valid license files for the
         Fortigate VNF from Fortinet, and the configuration file provided by
-        Enea as examples according to previous instructions.</para>
+        Enea as examples according to the previous instructions.</para>
 
         <figure>
           <title>Example License and Configuration files</title>
@@ -437,7 +408,7 @@
           <mediaobject>
             <imageobject>
               <imagedata align="center"
-                         fileref="images/fortigate_licenses.png" scale="75" />
+                         fileref="images/fortigate_licenses.png" scale="70" />
             </imageobject>
           </mediaobject>
         </figure>
@@ -467,130 +438,129 @@
               <row>
                 <entry align="left">Name</entry>
 
-                <entry>The name of the VM which will be created on the target
+                <entry align="left">Name of the VM which will be created on the uCPE
                 device.</entry>
               </row>
 
               <row>
                 <entry align="left">VNF Type</entry>
 
-                <entry>Name of the on-boarded VNF bundle.</entry>
+                <entry align="left">Name of the onboarded VNF bundle.</entry>
               </row>
 
               <row>
                 <entry align="left">VIM</entry>
 
-                <entry>Name and IP address of the device where the VNF has to
-                be instantiated.</entry>
+                <entry align="left">Name and IP address of the device where the VNF will
+                  be instantiated.</entry>
               </row>
 
               <row>
                 <entry align="left">License file</entry>
 
-                <entry>FortiGate license file provided by Fortinet.</entry>
+                <entry align="left">FortiGate license file provided by Fortinet.</entry>
               </row>
 
               <row>
                 <entry align="left">Configuration file</entry>
 
-                <entry>Firewall example configuration file provided by Enea
-                <filename>FGVM080000136187_20180828_0353_basic_fw.conf
-                </filename></entry>
+                <entry align="left">Firewall example configuration file provided by Enea 
+                  (<filename>FGVM080000136187_20180828_0353_basic_fw.conf
+                </filename>).</entry>
               </row>
 
               <row>
                 <entry align="left">Port1 - WAN</entry>
 
-                <entry>Set as dpdk type and connect it to wanmgrbr
-                bridge.</entry>
+                <entry align="left">Set the External Interface type to Dpdk and connect it to the 
+                  <literal>wanmgrbr</literal> ovs bridge.</entry>
               </row>
 
               <row>
                 <entry align="left">Port2 - LAN1</entry>
 
-                <entry>Set as dpdk type and connect it to lan1 bridge.</entry>
+                <entry align="left">Set the Incoming Interface type to Dpdk and connect it to the
+                  <literal>lan1</literal> ovs bridge.</entry>
               </row>
 
               <row>
                 <entry align="left">Port3 - LAN2</entry>
 
-                <entry>Set as dpdk type and connect it to lan2 bridge.</entry>
+                <entry align="left">Set the Outgoing Interface type to Dpdk and connect it to the
+                  <literal>lan2</literal> ovs bridge.</entry>
               </row>
             </tbody>
           </tgroup>
         </table>
-
-        <para>When the instantiation process is completed, the setup is ready
-        for testing.</para>
       </listitem>
     </orderedlist>
 
-    <para><emphasis role="bold">Test the FortiGate Firewall</emphasis></para>
+    <para><emphasis role="bold">Testing the FortiGate Firewall</emphasis></para>
 
-    <para>Connect the Test Machine on the LAN interface and access the
-    internet from the Test Machine to use the firewall on the target
-    device.</para>
+    <para>Connect the Test Machine on the LAN interface<remark>which lan interface?</remark> 
+      and access the internet from the Test Machine to use the firewall on the uCPE device.</para>
 
     <note>
-      <para>The connected Test Machine can be a laptop or a target that has
-      one interface configured to get an dynamic IP from a DHCP server. The
-      <literal>dhclient &lt;interface&gt;</literal> command can be used to
+      <para>The connected Test Machine can be a laptop or a uCPE device. It must have one 
+        interface configured to get a dynamic IP from a DHCP server. The 
+        <literal>dhclient &lt;interface&gt;</literal> command can be used to
       request an IP address. The received IP must be in the 172.16.1.2 -
       172.16.1.255 range.</para>
     </note>
 
     <figure>
-      <title>Testing Overview</title>
+      <title>Testing Setup Overview</title>
 
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/testing_fortigate.png"
-                     scale="50" />
+                     scale="60" />
         </imageobject>
       </mediaobject>
     </figure>
 
-    <para>In the example above, the FortiGate VNF management interface is
-    accessible through the WAN interface, the WAN IP address can be used from
-    a web browser on the Lab Machine to access the Fortigate VNF Management
-    Web UI. Please check the Fortigate VNF web management section for more
-    information.</para>
+    <para>In the example above<remark>what example exactly, in the overview picture or?</remark>, 
+      the FortiGate VNF management interface is accessible through the WAN interface. The 
+      WAN IP address can be used from a web browser on the Lab Machine to access the 
+      Fortigate VNF Management Web UI. Please check the Fortigate VNF web management section 
+      for more information.<remark>Note to self: An olink is needed to this section in this book,
+      use fortigate_webmg as the ID.</remark></para>
 
     <para>In another example, the firewall can be setup to use bridges as
-    connection points for the Fortigate VNF. It is possible to replace
-    OVS-DPDK bridges with SR-IOV connection points. <remark>The previous
-    sentence in the original was very hard to understand, please confirm if
-    this is what you intended to say</remark> Please check the network
-    configuration chapter on how to configure an interface for SR-IOV.</para>
+    connection points for the Fortigate VNF. It is possible to replace these 
+      OVS-DPDK bridges with SR-IOV connection points. Please check the network
+      configuration chapter on how to configure an interface for SR-IOV.<remark>An olink 
+      is needed but I can't add it without clarifying which chapter do you refer to?</remark></para>
 
     <para>It was previously assumed that three physical interfaces are
-    available for VNF connection. In the case of a firewall setup it is
-    possible to use only two physical interfaces for the data path (one for
-    WAN and one for LAN). In the example below only two interfaces will be
-    configured as DPDK and two bridges are created, one for each type of
-    connection.</para>
-
-    <para>At VNF instantiation instead of assigning distinct bridges for each
+    available for VNF connection. In the case of a firewall setup only two physical interfaces 
+      are needed for the data path (one for WAN and one for LAN).</para><remark>Is this the meaning you 
+    intented to convey in this sentence?</remark>
+    
+    <para>In the example below only two interfaces will be configured as DPDK, with two 
+      bridges created, one for each type of connection.</para>
+
+    <para>Please note that at VNF instantiation instead of assigning distinct bridges for each
     LAN interface, only one will be used for both LAN1 and LAN2, with no
-    changes in WAN interface configuration. Please see the picture below for
+    changes in WAN interface configuration. Please see the picture below for the
     final setup:</para>
 
     <figure>
-      <title>Two Interface Configuration</title>
+      <title>Two-Interface Configuration</title>
 
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/two_inst_firewall.png"
-                     scale="45" />
+                     scale="65" />
         </imageobject>
       </mediaobject>
     </figure>
   </section>
 
   <section id="fortigate_webmg">
-    <title>FortiGate VNF web management</title>
+    <title>FortiGate VNF Web Management</title>
 
-    <para>In order to check the IP address assigned to Fortigate VNF you need
+    <para>In order to check the IP address assigned to the Fortigate VNF you need
     to connect to the Fortigate CLI.</para>
 
     <para><emphasis role="bold">Connecting to the Fortigate
@@ -615,15 +585,14 @@
       </listitem>
 
       <listitem>
-        <para>To access Fortigate CLI, use the credential
-        <literal>admin</literal> for the user, leaving the password blank,
-        then press enter.</para>
+        <para>To access Fortigate CLI, use <literal>admin</literal> as the user, 
+          leaving the password blank/empty, and press enter.</para>
 
         <para>Use the CLI command <literal>get system interface</literal> to
         get the dynamic interfaces configuration.</para>
 
         <figure>
-          <title>Acessing and configuring Fortigate CLI</title>
+          <title>Accessing and configuring Fortigate CLI</title>
 
           <mediaobject>
             <imageobject>
@@ -662,14 +631,14 @@
           <mediaobject>
             <imageobject>
               <imagedata align="center"
-                         fileref="images/fortinet_interface.png" scale="30" />
+                         fileref="images/fortinet_interface.png" scale="33" />
             </imageobject>
           </mediaobject>
         </figure>
       </listitem>
 
       <listitem>
-        <para>Optional, alter the default Fortinet example configuration
+        <para>Optionally, alter the default Fortinet example configuration
         provided by Enea, through the following steps:</para>
 
         <orderedlist>
@@ -679,7 +648,7 @@
           </listitem>
 
           <listitem>
-            <para>Connect to the FortiGate VNF Web Management with a web
+            <para>Connect to the FortiGate VNF Web Management interface with a web
             browser.</para>
           </listitem>
 
@@ -689,8 +658,7 @@
           </listitem>
 
           <listitem>
-            <para>Store the updated configuration in a file, by saving in the
-            FortiGate VNF Web Management interface, so it may be used at the
+            <para>Store the updated configuration in a file, so it may be used at the
             next FortiGate VNF instantiation.</para>
           </listitem>
         </orderedlist>
@@ -706,13 +674,13 @@
   <section id="fortigate_sdwan_vpn">
     <title>FortiGate VNF as an SD-WAN VPN</title>
 
-    <para>The software-defined wide-area network (SD-WAN or SDWAN) is a
+    <para>The Software-Defined Wide-Area Network (SD-WAN or SDWAN) is a
     specific application of software-defined networking (SDN) technology
     applied to WAN connections. It connects enterprise networks, including
     branch offices and data centers, over large geographic distances.</para>
 
-    <para>SD-WAN decouples the network from the management plane, detaching
-    the traffic management and monitoring functions from hardware. Most forms
+    <para>SD-WAN decouples the network from the management plane, detaching 
+      traffic management and monitoring functions from hardware. Most forms
     of SD-WAN technology create a virtual overlay that is transport-agnostic,
     i.e. it abstracts underlying private or public WAN connections. With an
     overlay SD-WAN, a vendor provides an edge device to the customer that
@@ -730,7 +698,8 @@
     </note>
 
     <table>
-      <title>FortiGate VNF Example Configuration - SD-WAN Target 1</title>
+      <title>FortiGate VNF Example Configuration - SD-WAN uCPE device
+      1</title>
 
       <tgroup cols="2">
         <colspec align="center" />
@@ -745,26 +714,26 @@
 
         <tbody>
           <row>
-            <entry>SD-WAN</entry>
+            <entry align="left">SD-WAN</entry>
 
-            <entry>VPN connection between two branches (Target 1 and Target
-            2).</entry>
+            <entry>VPN connection between two branches (uCPE device 1 and uCPE
+            device 2).</entry>
           </row>
 
           <row>
-            <entry>VNFMgr (Virtual Port1)</entry>
+            <entry align="left">VNFMgr (Virtual Port1)</entry>
 
             <entry>DHCP Client, dynamically assigned IP address.</entry>
           </row>
 
           <row>
-            <entry>WAN (Virtual Port2)</entry>
+            <entry align="left">WAN (Virtual Port2)</entry>
 
             <entry>IP address: 10.0.0.1</entry>
           </row>
 
           <row>
-            <entry>LAN (Virtual Port3)</entry>
+            <entry align="left">LAN (Virtual Port3)</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -784,7 +753,8 @@
     </table>
 
     <table>
-      <title>FortiGate VNF Example Configuration - SD-WAN Target 2</title>
+      <title>FortiGate VNF Example Configuration - SD-WAN uCPE device
+      2</title>
 
       <tgroup cols="2">
         <colspec align="center" />
@@ -799,26 +769,26 @@
 
         <tbody>
           <row>
-            <entry>SD-WAN</entry>
+            <entry align="left">SD-WAN</entry>
 
-            <entry>VPN connection between two branches (Target 2 and Target
-            1).</entry>
+            <entry>VPN connection between two branches (uCPE device 2 and uCPE
+            device 1).</entry>
           </row>
 
           <row>
-            <entry>VNFMgr (Virtual Port1)</entry>
+            <entry align="left">VNFMgr (Virtual Port1)</entry>
 
             <entry>DHCP Client, dynamically assigned IP address.</entry>
           </row>
 
           <row>
-            <entry>WAN (Virtual Port2)</entry>
+            <entry align="left">WAN (Virtual Port2)</entry>
 
             <entry>IP address: 10.0.0.2</entry>
           </row>
 
           <row>
-            <entry>LAN (Virtual Port3)</entry>
+            <entry align="left">LAN (Virtual Port3)</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -858,7 +828,7 @@
 
         <tbody>
           <row>
-            <entry>Lab Network</entry>
+            <entry align="left">Lab Network</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -874,7 +844,7 @@
           </row>
 
           <row>
-            <entry>Two Intel Whitebox target devices</entry>
+            <entry align="left">Two Intel Whitebox uCPE devices</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -913,7 +883,7 @@
           </row>
 
           <row>
-            <entry>One Lab Machine</entry>
+            <entry align="left">One Lab Machine</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -933,7 +903,7 @@
           </row>
 
           <row>
-            <entry>Two Test Machines</entry>
+            <entry align="left">Two Test Machines</entry>
 
             <entrytbl cols="1">
               <tbody>
@@ -953,18 +923,18 @@
           </row>
 
           <row>
-            <entry>FortiGate VNF</entry>
+            <entry align="left">FortiGate VNF</entry>
 
             <entrytbl cols="1">
               <tbody>
                 <row>
-                  <entry>Downloaded the FortiGate VNF Bundle from Enea Portal
+                  <entry>FortiGate VNF Bundle downloaded from the Enea Portal
                   to the Lab Machine file system.</entry>
                 </row>
 
                 <row>
-                  <entry>Downloaded FortiGate configuration examples from Enea
-                  Portal to Lab Machine file system. Unpack the configuration
+                  <entry>FortiGate configuration examples downloaded from the Enea
+                  Portal to the Lab Machine file system. Unpack the configuration
                   examples specific for SD-WAN on the Lab Machine.</entry>
                 </row>
 
@@ -990,7 +960,7 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/sdwan_vpn_overview_1.png"
-                     scale="50" />
+                     scale="55" />
         </imageobject>
       </mediaobject>
     </figure>
@@ -1002,7 +972,7 @@
 
     <para>Since the SD-WAN VNF uses three External Network Interfaces, three
     bridges need to be configured. Each bridge provides the ability to connect
-    a physical network interface to the virtual machine's virtual network
+    a physical network interface to the VM's virtual network
     interface. Each physical to virtual network interface connection is setup
     in two steps:</para>
 
@@ -1023,7 +993,7 @@
 
     <orderedlist>
       <listitem>
-        <para>Bind physical interface to DPDK by selecting the target_1:
+        <para>Bind a physical interface to the DPDK by selecting uCPE device 1 first, then:
         <literal>Configuration</literal> -&gt; <literal>OpenVSwitch</literal>
         -&gt; <literal>Host Interfaces</literal> -&gt;
         <literal>Add</literal>:</para>
@@ -1039,8 +1009,8 @@
           </mediaobject>
         </figure>
 
-        <para>The result of binding these three interfaces should look like
-        the following:</para>
+        <para>Repeat this step for the other two interfaces. The result of a successful binding 
+          should look like the following:</para>
 
         <figure>
           <title>Results of Binding</title>
@@ -1055,15 +1025,13 @@
       </listitem>
 
       <listitem>
-        <para>Create one OpenVSwitch bridge for each SD-WAN network connection
-        (VNF management, WAN and LAN) by selecting the <literal>Add</literal>
-        button from the Bridges tab by selecting the target:
-        <literal>Configuration</literal> -&gt;
-        <literal>OpenvSwitch</literal>-&gt; <literal>Bridges</literal>. A
-        popup like this should appear:</para>
+        <para>Create an Open vSwitch bridge for each SD-WAN network connection
+        (VNF management, WAN and LAN) by selecting the uCPE device then: 
+          <literal>Configuration</literal> -&gt; <literal>OpenvSwitch</literal> -&gt; 
+          <literal>Bridges</literal> -&gt; <literal>Add</literal>. A popup will appear:</para>
 
         <figure>
-          <title>Creating an OpenVSwitch bridge for an SD-WAN network
+          <title>Creating an Open vSwitch bridge for an SD-WAN network
           connection</title>
 
           <mediaobject>
@@ -1080,7 +1048,7 @@
         be created:</para>
 
         <figure>
-          <title>The three newly created Bridges</title>
+          <title>OVS Bridges</title>
 
           <mediaobject>
             <imageobject>
@@ -1092,22 +1060,21 @@
       </listitem>
     </orderedlist>
 
-    <para>Once the interfaces and bridges are ready, only the on-boarding and
-    instantiation of the VNF remains to be done.</para>
+    <para>Once the interfaces and bridges are ready, onboard and instantiate the VNF.</para>
 
     <para><emphasis role="bold">Onboarding the FortiGate VNF</emphasis></para>
 
     <orderedlist>
       <listitem>
-        <para>To on-board a VNF, select target on the map and click the
+        <para>To onboard a VNF, select a uCPE device on the map and click  the
         <literal>VNF</literal> button in the top toolbar. Then, click the
         <literal>Descriptors</literal> -&gt; <literal>On-board</literal> -&gt;
         <literal>Browse</literal> options, and select the
-        <filename>Fortigate.zip</filename> file, before clicking
+        <filename>Fortigate.zip</filename> file, before pressing
         <literal>Send</literal>:</para>
 
         <figure>
-          <title>On-boarding FortiGate VNF</title>
+          <title>Onboarding FortiGate VNF</title>
 
           <mediaobject>
             <imageobject>
@@ -1139,15 +1106,15 @@
 
     <para><emphasis role="bold">Instantiating the FortiGate
     VNF</emphasis></para>
-
-    <para>The following steps describe how to instantiate the Fortigate
-    VNF.</para>
+    
+    <note><para>Download locally the valid license files for the Fortigate VNF from 
+      Fortinet and  the configuration file provided by Enea as examples.</para>
+    </note>
 
     <orderedlist>
       <listitem>
-        <para>Select the target, then from the top toolbar click on
-        <literal>VNF</literal>-&gt; <literal>Instances</literal> -&gt;
-        <literal>Add</literal> options:</para>
+        <para>Select a uCPE device on the map, then from the top toolbar click 
+          <literal>VNF</literal> -&gt; <literal>Instances</literal> -&gt; <literal>Add</literal>:</para>
 
         <figure>
           <title>Adding an Instance</title>
@@ -1155,24 +1122,18 @@
           <mediaobject>
             <imageobject>
               <imagedata align="center" fileref="images/adding_instance.png"
-                         scale="50" />
+                         scale="52" />
             </imageobject>
           </mediaobject>
         </figure>
-
-        <note>
-          <para>Download locally the valid license files for the Fortigate VNF
-          from Fortinet and the configuration file provided by Enea as
-          examples.</para>
-        </note>
       </listitem>
 
       <listitem>
         <para>Use the <literal>sdwan1</literal> example configuration file for
-        the first target:</para>
+        uCPE device 1:</para>
 
         <figure>
-          <title>Configuring target_1</title>
+          <title>Configuring uCPE device 1</title>
 
           <mediaobject>
             <imageobject>
@@ -1184,10 +1145,10 @@
       </listitem>
     </orderedlist>
 
-    <para>Fortigate VNF instantiation requires the following settings:</para>
+    <para>FortiGate VNF instantiation requires the following settings:</para>
 
     <table>
-      <title>Fortigate VNF Instantiation Requirements</title>
+      <title>FortiGate VNF Instantiation Requirements</title>
 
       <tgroup cols="2">
         <colspec align="left" colwidth="2*" />
@@ -1206,72 +1167,71 @@
           <row>
             <entry>Name</entry>
 
-            <entry>The name of the VM which will be created on target
-            device.</entry>
+            <entry>The name of the VM which will be created on the uCPE device.</entry>
           </row>
 
           <row>
             <entry>VNF Type</entry>
 
-            <entry>The name of the on-boarded VNF bundle.</entry>
+            <entry>The name of the onboarded VNF bundle.</entry>
           </row>
 
           <row>
             <entry>VIM</entry>
 
-            <entry>Name and IP address of the device where the VNF has to be
+            <entry>Name and IP address of the device where the VNF will be
             instantiated.</entry>
           </row>
 
           <row>
             <entry>License file</entry>
 
-            <entry>FortiGate license file provided by Fortinet.</entry>
+            <entry>The FortiGate license file provided by Fortinet.</entry>
           </row>
 
           <row>
-            <entry>Configuration file</entry>
+            <entry>Configuration file(s)</entry>
 
-            <entry>SD-WAN example configuration files provided by Enea: -
-            FGVM080000136187_20180215_0708_sdwan1.conf -
-            FGVM080000136188_20180215_0708_sdwan2.conf</entry>
+            <entry>SD-WAN example configuration files provided by Enea: 
+              <literal>FGVM080000136187_20180215_0708_sdwan1.conf</literal>
+              <literal>FGVM080000136188_20180215_0708_sdwan2.conf</literal></entry>
           </row>
 
           <row>
             <entry>Port1 - VNFMgr</entry>
 
-            <entry>Set as dpdk type and connect it to vnfmgrbr bridge.</entry>
+            <entry>Set as Dpdk type and connect it to the <literal>vnfmgrbr</literal> bridge.</entry>
           </row>
 
           <row>
             <entry>Port2 - WAN</entry>
 
-            <entry>Set as dpdk type and connect it to wanbr bridge.</entry>
+            <entry>Set as Dpdk type and connect it to the <literal>wanbr</literal> bridge.</entry>
           </row>
 
           <row>
             <entry>Port3 - LAN</entry>
 
-            <entry>Set as dpdk type and connect it to lanbr bridge.</entry>
+            <entry>Set as Dpdk type and connect it to the <literal>lanbr</literal> bridge.</entry>
           </row>
         </tbody>
       </tgroup>
     </table>
 
-    <para>To complete the branch-to-branch setup, configure the peer target in
-    the same way as <literal>target_1</literal>. Make sure to use the
-    <filename>FGVM080000136188_20180215_0708_sdwan2.conf</filename>
+    <para>To complete the branch-to-branch setup, configure the peer uCPE
+    device in the same way as <literal>uCPE device 1</literal>. Make sure to
+    use the <filename>FGVM080000136188_20180215_0708_sdwan2.conf</filename>
     configuration file for the second VNF instantiation.</para>
 
     <para><emphasis role="bold">Testing the FortiGate SD-WAN
     VPN</emphasis></para>
 
-    <para>Once the full SD-WAN setup is in place a VPN connection needs to
-    established between the two targets. The Test Machines can be connected to
-    the LAN interface on each target.</para>
+    <para>Once the full SD-WAN setup is in place a VPN connection needs to be
+    established between the two uCPE devices. The Test Machines can be
+    connected to the LAN interface on each uCPE device.</para>
 
-    <para>The connected Test Machine can be a laptop or a target that has one
-    interface configured to get dynamic IP from a DHCP server. The
+    <para>The connected Test Machine can be a laptop or a uCPE device that has
+    one interface configured to get a dynamic IP from a DHCP server. The
     <command>dhclient &lt;interface&gt;</command> command can be used to
     request an IP address.</para>
 
@@ -1287,13 +1247,13 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/test_machines.png"
-                     scale="40" />
+                     scale="45" />
         </imageobject>
       </mediaobject>
     </figure>
 
-    <para>Target 1 should be able to ping Test target 2 in this setup over the
-    WAN connection.</para>
+    <para>uCPE device 1 should be able to ping Test uCPE device 2 in this
+    setup over the WAN connection.</para>
 
     <para>In the figure above and this example, the FortiGate VNF management
     interface is accessible through a dedicated Mgmt interface. The Mgmt IP
@@ -1302,8 +1262,8 @@
 
     <note>
       <para>In this SD-WAN VPN setup example, bridges were used as connection
-      points for Fortigate VNF. It is possible to replace OVS-DPDK bridges
+      points for the Fortigate VNF. It is possible to replace OVS-DPDK bridges
       with SR-IOV connection points.</para>
     </note>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.png b/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.png
index cdfb4d3..03a618f 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/clav_VNF_demo_SR-IOV.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/descriptor_button.png b/doc/book-enea-nfv-access-example-usecases/doc/images/descriptor_button.png
deleted file mode 100755
index 72b59bc..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/descriptor_button.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.png b/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.png
index a3a8a85..48b3a94 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/enea_vnf_demo_overview.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/host_interface_creation.png b/doc/book-enea-nfv-access-example-usecases/doc/images/host_interface_creation.png
deleted file mode 100755
index 6fabb9b..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/host_interface_creation.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_client_inttype.png b/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_client_inttype.png
deleted file mode 100755
index 486f9d9..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_client_inttype.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_server_inttype.png b/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_server_inttype.png
deleted file mode 100755
index 000e250..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/iperf_server_inttype.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/onboarding_status.png b/doc/book-enea-nfv-access-example-usecases/doc/images/onboarding_status.png
deleted file mode 100755
index 8adb954..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/onboarding_status.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_tab.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_tab.png
deleted file mode 100755
index 9d096c9..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_tab.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_two.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_two.png
deleted file mode 100755
index 3f4c427..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_two.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_zero.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_zero.png
deleted file mode 100755
index 3f4c427..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_bridge_zero.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_host_interface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_host_interface.png
deleted file mode 100755
index 3ccdd66..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/ovs_host_interface.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/secondtar_hostinterface.png b/doc/book-enea-nfv-access-example-usecases/doc/images/secondtar_hostinterface.png
deleted file mode 100755
index 6fabb9b..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/secondtar_hostinterface.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/testPMD_VNF_PCI.png b/doc/book-enea-nfv-access-example-usecases/doc/images/testPMD_VNF_PCI.png
index 03f298f..5aeebbf 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/testPMD_VNF_PCI.png
+++ b/doc/book-enea-nfv-access-example-usecases/doc/images/testPMD_VNF_PCI.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
deleted file mode 100755
index 9c2ca82..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_forward.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png b/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
deleted file mode 100755
index 9decd36..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/traffic_terminate.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_dpdk_int_bind.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_dpdk_int_bind.png
deleted file mode 100755
index ea1fef7..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_dpdk_int_bind.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fortigate_onboard.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fortigate_onboard.png
deleted file mode 100755
index 6fa40bd..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_ibm_fortigate_onboard.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance.png b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance.png
deleted file mode 100755
index ecfee74..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instance.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instances.png b/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instances.png
deleted file mode 100755
index e07bd9e..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/vnf_instances.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml b/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
index f28fc4e..3aea4f5 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/inband_management.xml
@@ -14,12 +14,12 @@
     <mediaobject>
       <imageobject>
         <imagedata align="center" fileref="images/uc_ibm_solution.png"
-                   scale="50" />
+                   scale="55" />
       </imageobject>
     </mediaobject>
   </figure>
 
-  <para>Setup uses the following network configuration:</para>
+  <para>This Setup uses the following network configuration:</para>
 
   <itemizedlist>
     <listitem>
@@ -31,8 +31,8 @@
     </listitem>
   </itemizedlist>
 
-  <para>For prerequisites and further details, please see <xref
-  linkend="inband_management" /> and <xref linkend="vnf_fortigate" />.</para>
+  <para>For prerequisites and further details, please see <xref linkend="inband_management" /> 
+    and <xref linkend="vnf_fortigate" /><remark>Are these references still valid?</remark>.</para>
 
   <section id="mg_activation">
     <title>In-band management activation for FortiGate VNF
@@ -110,17 +110,6 @@
             <literal>ovs-bridge-type</literal>.</para>
           </listitem>
         </itemizedlist>
-
-        <figure>
-          <title>Bind LAN physical port to dpdk</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/uc_ibm_dpdk_int_bind.png" scale="75" />
-            </imageobject>
-          </mediaobject>
-        </figure>
       </listitem>
 
       <listitem>
@@ -128,17 +117,17 @@
 
         <itemizedlist>
           <listitem>
-            <para>Select the <literal>Device.</literal></para>
+            <para>Select the <literal>Device</literal>.</para>
           </listitem>
 
           <listitem>
             <para>In the Configuration menu select
-            <literal>OpenVSwitch.</literal></para>
+            <literal>OpenVSwitch</literal>.</para>
           </listitem>
 
           <listitem>
             <para>Open the <literal>Bridges</literal> menu and click
-            <literal>Add.</literal></para>
+            <literal>Add</literal>.</para>
           </listitem>
         </itemizedlist>
 
@@ -168,7 +157,7 @@
 
         <note>
           <para>The WAN port of the very first VNF instantiated on the device
-          must be connected to the <literal>ibm-wan-br bridge</literal>. All
+          must be connected to the <literal>ibm-wan-br</literal>bridge. All
           other VNFs must be connected in chain with the first VNF.</para>
         </note>
       </listitem>
@@ -178,7 +167,7 @@
 
         <itemizedlist>
           <listitem>
-            <para>Select the <literal>Device.</literal></para>
+            <para>Select the <literal>Device</literal>.</para>
           </listitem>
 
           <listitem>
@@ -195,18 +184,6 @@
             pressing the <literal>Send</literal> button.</para>
           </listitem>
         </itemizedlist>
-
-        <figure>
-          <title>Onboard Fortigate VNF</title>
-
-          <mediaobject>
-            <imageobject>
-              <imagedata align="center"
-                         fileref="images/uc_ibm_fortigate_onboard.png"
-                         scale="50" />
-            </imageobject>
-          </mediaobject>
-        </figure>
       </listitem>
 
       <listitem>
@@ -214,7 +191,7 @@
 
         <itemizedlist>
           <listitem>
-            <para>Select the <literal>Device.</literal></para>
+            <para>Select the <literal>Device</literal>.</para>
           </listitem>
 
           <listitem>
@@ -224,7 +201,7 @@
           <listitem>
             <para>Choose the <literal>Instances</literal> option, select the
             VNF configuration you desire and press
-            <literal>Add.</literal></para>
+            <literal>Add</literal>.</para>
           </listitem>
 
           <listitem>
@@ -234,7 +211,7 @@
         </itemizedlist>
 
         <figure>
-          <title>Instantiate Fortigate VNF</title>
+          <title>Instantiate the FortiGate VNF</title>
 
           <mediaobject>
             <imageobject>
@@ -249,7 +226,7 @@
 
     <para>Once the VNF is instantiated, the setup is complete and ready for
     testing. Connect the test machine to the LAN port. It will receive an IP
-    address from the Fortigate VNF and be able to access the internet.</para>
+    address from the FortiGate VNF and be able to access the internet.</para>
   </section>
 
   <section id="test_fortvnf_inband">
@@ -261,7 +238,7 @@
       <mediaobject>
         <imageobject>
           <imagedata align="center" fileref="images/uc_ibm_solution_test.png"
-                     scale="50" />
+                     scale="52" />
         </imageobject>
       </mediaobject>
     </figure>
@@ -271,11 +248,11 @@
 
     <itemizedlist>
       <listitem>
-        <para>Device management traffic from uCPE Manager.</para>
+        <para>Device management traffic from the uCPE Manager.</para>
       </listitem>
 
       <listitem>
-        <para>Fortigate management interface traffic from a web
+        <para>FortiGate management interface traffic from a web
         browser.</para>
       </listitem>
 
@@ -284,13 +261,13 @@
       </listitem>
     </itemizedlist>
 
-    <para>Having access from the uCPE Manager to the device as shown above,
-    demonstrates that device management traffic passes through the in-band
+    <para>If you have access from the uCPE Manager to the device as shown above, this 
+      demonstrates that device management traffic passes through the In-band
     management WAN bridge successfully.</para>
 
     <para>To access the management interface of the VNF, connect from a web
     browser to the public IP address of the device e.g.
     <literal>https://&lt;IP&gt;</literal>. From a Test machine connected on
-    LAN port, try a test ping to the internet e.g. "ping 8.8.8.8".</para>
+    the LAN port, try a test ping to the internet e.g. "ping 8.8.8.8".</para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml b/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
new file mode 100644
index 0000000..208cd0e
--- /dev/null
+++ b/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<chapter id="intro">
+  <title>Introduction</title>
+
+  <para>This document describes several example use-cases concerning uCPE device 
+    network interface configuration, onboarding and instantiation of certain VNFs, 
+    VNF chaining, and In-band management.</para>
+  
+  <note><para>Before running any example make sure the uCPE device(s) have been 
+    added to the uCPE Manager and placed on the map.</para>
+  </note>
+  
+  <para>For detailed information on how to add a device to the uCPE Manager, how 
+    to configure the network interfaces to use DPDK, PCI-passthrough or SR-IOV drivers, 
+    or VNF configuration, please refer to the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xpointer="element(book_enea_nfv_access_getting_started/1)" /> Manual.</para>
+</chapter>